Merge Dev

README.md

@@ -39,7 +39,7 @@ npm run dev
 - [Google-Java-Codestyle](https://github.com/google/styleguide/blob/gh-pages/intellij-java-google-style.xml)
     - Intellij: Settings > Editor > Codestyle > Scheme 
 
-Run backend mit LDAP-Container:
+Run backend-stack:
 ```bash
-docker compose up ldap backend --build
+docker compose up ldap backend mariadb --build
 ```

backend/Dockerfile

@@ -10,6 +10,4 @@ WORKDIR /app
 COPY --from=backend /app/backend/target/*.jar ./backend.jar
 EXPOSE 8081
 ENV DATA_LOCATION /data
-ARG LDAP_URI
-ENV LDAP_URI $LDAP_URI
 CMD ["java", "-jar", "backend.jar"]

backend/pom.xml

@@ -49,10 +49,16 @@
 
 
     <dependency>
-      <artifactId>h2</artifactId>
-      <groupId>com.h2database</groupId>
-      <scope>runtime</scope>
+      <groupId>org.mariadb.jdbc</groupId>
+      <artifactId>mariadb-java-client</artifactId>
+      <version>2.7.4</version>
     </dependency>
+    <dependency>
+      <groupId>org.liquibase</groupId>
+      <artifactId>liquibase-core</artifactId>
+      <version>4.27.0</version>
+    </dependency>
+
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>

backend/src/main/java/de/unipassau/fim/fsinfo/prost/controller/InvoiceController.java

@@ -39,7 +39,8 @@ public Page<InvoiceDTO> getInvoices(
       @RequestParam(defaultValue = "10") int s,
       @RequestParam(required = false) String userId,
       @RequestParam(required = false) Boolean mailed) {
-    return invoiceService.getInvoices(Math.max(0, p), Math.max(1, s), mailed, userId);
+    return invoiceService.getInvoices(Math.max(0, p), Math.min(Math.max(1, s), 100), mailed,
+        userId);
   }
 
   /**
@@ -50,11 +51,14 @@ public Page<InvoiceDTO> getInvoices(
   @GetMapping("/me")
   public Page<InvoiceDTO> getPersonalInvoices(
       @RequestParam(defaultValue = "0") int p,
-      @RequestParam(defaultValue = "10") int s,
-      @RequestParam(required = false) Boolean mailed, Authentication authentication) {
+      @RequestParam(defaultValue = "10") int s, Authentication authentication) {
+    if (authentication == null) {
+      return Page.empty();
+    }
+
     CustomUserDetails userDetails = (CustomUserDetails) authentication.getPrincipal();
 
-    return invoiceService.getPersonalInvoices(Math.max(0, p), Math.max(1, s), mailed,
+    return invoiceService.getInvoices(Math.max(0, p), Math.min(Math.max(1, s), 100), true,
         userDetails.getUsername());
   }
 

backend/src/main/java/de/unipassau/fim/fsinfo/prost/controller/ShopController.java

@@ -84,6 +84,10 @@ public ResponseEntity<FileSystemResource> getDisplayImage(@RequestParam String i
   @PostMapping("/item/consume")
   public ResponseEntity<String> consume(@RequestParam String id, @RequestParam String userId,
       @RequestParam(required = false) Integer n, Authentication authentication) {
+    if (authentication == null) {
+      return ResponseEntity.badRequest().build();
+    }
+
     CustomUserDetails userDetails = (CustomUserDetails) authentication.getPrincipal();
 
     Collection<UserAccessRole> roles = authService.getRoles(authentication);
@@ -107,14 +111,15 @@ public ResponseEntity<String> consume(@RequestParam String id, @RequestParam Str
         (n == null ? 1 : n), userDetails.getUsername())) {
       return ResponseEntity.ok().build();
     }
-    return ResponseEntity.badRequest().build();
+    return ResponseEntity.badRequest().body(permitted + " " + highestPermission);
 
   }
 
   @PostMapping("/settings/create")
   public ResponseEntity<ShopItem> create(@RequestBody ShopItem itemTemplate) {
-    Optional<ShopItem> shopItem = shopService.createItem(itemTemplate.getId(), itemTemplate.getDisplayName(),
-            itemTemplate.getCategory(), itemTemplate.getPrice());
+    Optional<ShopItem> shopItem = shopService.createItem(itemTemplate.getId(),
+        itemTemplate.getDisplayName(),
+        itemTemplate.getCategory(), itemTemplate.getPrice());
 
     return shopItem.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.badRequest().build());
   }
@@ -132,7 +137,7 @@ public ResponseEntity<Optional<ShopItem>> delete(@RequestParam String id) {
   @PostMapping("/settings/item/displayname")
   public ResponseEntity<String> displayName(@RequestParam String id,
       @RequestParam String value) {
-    Optional<ShopItem> shopItem = shopService.changeDisplayName(id,value);
+    Optional<ShopItem> shopItem = shopService.changeDisplayName(id, value);
 
     if (shopItem.isPresent()) {
       return ResponseEntity.ok().build();
@@ -143,7 +148,7 @@ public ResponseEntity<String> displayName(@RequestParam String id,
   @PostMapping("/settings/item/category")
   public ResponseEntity<String> displayCategory(@RequestParam String id,
       @RequestParam String value) {
-    Optional<ShopItem> shopItem = shopService.changeCategory(id,value);
+    Optional<ShopItem> shopItem = shopService.changeCategory(id, value);
 
     if (shopItem.isPresent()) {
       return ResponseEntity.ok().build();
@@ -154,7 +159,7 @@ public ResponseEntity<String> displayCategory(@RequestParam String id,
   @PostMapping("/settings/item/price")
   public ResponseEntity<String> price(@RequestParam String id,
       @RequestParam String value) {
-    Optional<ShopItem> shopItem = shopService.changePrice(id,value);
+    Optional<ShopItem> shopItem = shopService.changePrice(id, value);
 
     if (shopItem.isPresent()) {
       return ResponseEntity.ok().build();
@@ -180,21 +185,17 @@ public ResponseEntity<String> setDisplayImage(@RequestParam String id,
 
   @PostMapping("/settings/item/enable")
   public ResponseEntity<String> enable(@RequestParam String id) {
-    Optional<ShopItem> item = itemRepository.findById(id);
-    if (item.isPresent()) {
-      item.get().setEnabled(true);
-      itemRepository.save(item.get());
+    Optional<ShopItem> shopItem = shopService.enable(id);
+    if (shopItem.isPresent()) {
       return ResponseEntity.ok().build();
     }
     return ResponseEntity.badRequest().build();
   }
 
   @PostMapping("/settings/item/disable")
   public ResponseEntity<String> disable(@RequestParam String id) {
-    Optional<ShopItem> item = itemRepository.findById(id);
-    if (item.isPresent()) {
-      item.get().setEnabled(false);
-      itemRepository.save(item.get());
+    Optional<ShopItem> shopItem = shopService.disable(id);
+    if (shopItem.isPresent()) {
       return ResponseEntity.ok().build();
     }
     return ResponseEntity.badRequest().build();

backend/src/main/java/de/unipassau/fim/fsinfo/prost/controller/ShopHistoryController.java

@@ -3,6 +3,7 @@
 import de.unipassau.fim.fsinfo.prost.data.dto.ShopItemHistoryEntryDTO;
 import de.unipassau.fim.fsinfo.prost.security.CustomUserDetailsContextMapper.CustomUserDetails;
 import de.unipassau.fim.fsinfo.prost.service.ShopHistoryService;
+import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.security.core.Authentication;
@@ -32,7 +33,13 @@ public Page<ShopItemHistoryEntryDTO> getTransactions(
       @RequestParam(defaultValue = "0") int p,
       @RequestParam(defaultValue = "10") int s,
       @RequestParam(required = false) String receiverId) {
-    return shopHistoryService.getHistory(Math.max(0, p), Math.max(1, s), receiverId);
+    if (receiverId == null) {
+      return shopHistoryService.getHistory(Math.max(0, p), Math.min(Math.max(1, s), 100),
+          Optional.empty());
+    } else {
+      return shopHistoryService.getHistory(Math.max(0, p), Math.min(Math.max(1, s), 100),
+          Optional.of(receiverId));
+    }
   }
 
   /**
@@ -45,9 +52,12 @@ public Page<ShopItemHistoryEntryDTO> getPersonalTransactions(
       @RequestParam(defaultValue = "0") int p,
       @RequestParam(defaultValue = "10") int s,
       Authentication authentication) {
+    if (authentication == null) {
+      return Page.empty();
+    }
     CustomUserDetails userDetails = (CustomUserDetails) authentication.getPrincipal();
 
-    return shopHistoryService.getHistory(Math.max(0, p), Math.max(1, s),
-        userDetails.getUsername());
+    return shopHistoryService.getHistory(Math.max(0, p), Math.min(Math.max(1, s), 100),
+        Optional.of(userDetails.getUsername()));
   }
 }

backend/src/main/java/de/unipassau/fim/fsinfo/prost/controller/TransactionController.java

@@ -30,6 +30,10 @@ public TransactionController(TransactionService transactionService) {
   @PostMapping("/change")
   public ResponseEntity<BigDecimal> balance(@RequestParam String id,
       @RequestParam String value, Authentication authentication) {
+    if (authentication == null || value == null || id == null) {
+      return ResponseEntity.badRequest().build();
+    }
+
     CustomUserDetails userDetails = (CustomUserDetails) authentication.getPrincipal();
 
     try {
@@ -50,6 +54,10 @@ public ResponseEntity<BigDecimal> balance(@RequestParam String id,
   @PostMapping("/deposit")
   public ResponseEntity<BigDecimal> deposit(@RequestParam String id,
       @RequestParam String value, Authentication authentication) {
+    if (authentication == null || value == null || id == null) {
+      return ResponseEntity.badRequest().build();
+    }
+
     CustomUserDetails userDetails = (CustomUserDetails) authentication.getPrincipal();
 
     try {
@@ -77,7 +85,8 @@ public Page<TransactionEntry> getTransactions(
       @RequestParam(defaultValue = "0") int p,
       @RequestParam(defaultValue = "10") int s,
       @RequestParam(required = false) String receiverId) {
-    return transactionService.getTransactions(Math.max(0, p), Math.max(1, s), receiverId);
+    return transactionService.getTransactions(Math.max(0, p), Math.min(Math.max(1, s), 100),
+        receiverId);
   }
 
   /**
@@ -90,9 +99,13 @@ public Page<TransactionEntry> getPersonalTransactions(
       @RequestParam(defaultValue = "0") int p,
       @RequestParam(defaultValue = "10") int s,
       Authentication authentication) {
+    if (authentication == null) {
+      return Page.empty();
+    }
+
     CustomUserDetails userDetails = (CustomUserDetails) authentication.getPrincipal();
 
-    return transactionService.getPersonalTransactions(Math.max(0, p), Math.max(1, s),
+    return transactionService.getPersonalTransactions(Math.max(0, p), Math.min(Math.max(1, s), 100),
         userDetails.getUsername());
   }
 

backend/src/main/java/de/unipassau/fim/fsinfo/prost/controller/UserController.java

@@ -2,7 +2,6 @@
 
 import de.unipassau.fim.fsinfo.prost.data.dao.ProstUser;
 import de.unipassau.fim.fsinfo.prost.security.CustomUserDetailsContextMapper.CustomUserDetails;
-import de.unipassau.fim.fsinfo.prost.service.TransactionService;
 import de.unipassau.fim.fsinfo.prost.service.UserService;
 import java.util.List;
 import java.util.Optional;
@@ -22,12 +21,10 @@
 public class UserController {
 
   private final UserService userService;
-  private final TransactionService transactionService;
 
   @Autowired
-  public UserController(UserService userService, TransactionService transactionService) {
+  public UserController(UserService userService) {
     this.userService = userService;
-    this.transactionService = transactionService;
   }
 
   /**
@@ -43,6 +40,9 @@ public ResponseEntity<List<ProstUser>> list(@RequestParam(required = false) Stri
 
   @GetMapping("/me")
   public ResponseEntity<ProstUser> me(Authentication authentication) {
+    if (authentication == null) {
+      return ResponseEntity.badRequest().build();
+    }
     CustomUserDetails userDetails = (CustomUserDetails) authentication.getPrincipal();
 
     Optional<List<ProstUser>> users = userService.info(userDetails.getUsername());
@@ -55,7 +55,11 @@ public ResponseEntity<ProstUser> create(@RequestBody ProstUser userTemplate) {
 
     Optional<ProstUser> user = userService.createUser(userTemplate.getId(),
         userTemplate.getDisplayName(),
-        userTemplate.getEmail());
+        userTemplate.getEmail(), true);
+
+    if (user.isPresent() && userTemplate.getTotalSpent() != null) {
+      userService.setMoneySpent(user.get().getId(), userTemplate.getTotalSpent().toString());
+    }
 
     return user.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.badRequest().build());
   }

backend/src/main/java/de/unipassau/fim/fsinfo/prost/data/DataFilter.java

@@ -0,0 +1,64 @@
+package de.unipassau.fim.fsinfo.prost.data;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class DataFilter {
+
+  private static final String EMAIL_PATTERN = "^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+\\.+[a-zA-Z0-9.-]+$";
+  final static int MAX_NAME_LENGTH = 30;
+
+  public static boolean isValidString(String value, String name) {
+    if (value == null || value.isBlank()) {
+      System.out.println("[DF] :: " + name + " is empty");
+      return false;
+    }
+    if (value.length() > MAX_NAME_LENGTH) {
+      System.out.println("[DF] :: " + name + " size to large");
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Filters all kind of ids that have to be readable to be lowercase and without spaces
+   *
+   * @param id the previous id
+   * @return the filtered id
+   */
+  public static String filterNameId(String id) {
+    StringBuilder filtered = new StringBuilder();
+    for (char c : id.toLowerCase().toCharArray()) {
+      if (Character.isLowerCase(c) || Character.isDigit(c)) {
+        filtered.append(c);
+      }
+    }
+
+    return filtered.toString();
+  }
+
+  public static boolean isValidEmail(String email) {
+    if (email == null) {
+      return false;
+    }
+
+    Pattern pattern = Pattern.compile(EMAIL_PATTERN);
+    Matcher matcher = pattern.matcher(email);
+    return matcher.matches();
+  }
+
+  public static String formatMoney(BigDecimal amount) {
+    if (amount == null) {
+      amount = new BigDecimal(0);
+    }
+    DecimalFormat df = (DecimalFormat) NumberFormat.getCurrencyInstance(Locale.GERMANY);
+    df.setMinimumFractionDigits(2); // Ensure two decimal places
+    df.setMaximumFractionDigits(2); // Ensure two decimal places
+    return df.format(amount);
+  }
+
+}