Merge pull request 'dev' (#8) from dev into main

Reviewed-on: #8

.gitea/workflows/build.yml

@@ -15,32 +15,40 @@ jobs:
         uses: actions/checkout@v2
 
       # 2. Set up Java and Maven
-      - name: Set up JDK
+      - name: Set up JDK (Eclipse Temurin)
         uses: actions/setup-java@v3
         with:
+          distribution: "temurin"
           java-version: "17"
+          cache: maven
 
-      - name: Verify Maven installation
+      # 3. Verify Maven installation
+      - name: Install Maven
         run: |
+          sudo apt-get update
+          sudo apt-get install -y maven
           mvn -version
 
-      # 3. Build the Spring Boot application
+      # 4. Build the Spring Boot application
       - name: Build Spring Boot Application
         run: |
           mvn clean package -DskipTests
 
-      # 4. Set up Docker
+      # 5. Set up Docker
       - name: Set up Docker
         run: |
           docker --version
-          docker-compose --version
 
-      # 5. Build the Docker image using docker-compose
+      # 6. Build the Docker image
       - name: Build and Package Docker Image
         run: |
-          docker-compose build
+          docker build -t tea.zendric.de/cedric/xpensely-server:latest .
 
-      # 6. Start the application with dependencies
+      # 7. Docker login
-      - name: Start the Docker Compose Application
+      - name: Login to Docker Registry
         run: |
-          docker-compose up -d
+          echo "${{ secrets.TEAPASSWORD }}" | docker login tea.zendric.de -u ${{ secrets.TEAUSER }} --password-stdin
+      # 8. Push Docker image
+      - name: Push the Docker Image to registry
+        run: |
+          docker push tea.zendric.de/cedric/xpensely-server:latest

.gitea/workflows/tag_release.yml

@@ -0,0 +1,84 @@
+name: Build and Deploy Versioned Spring Boot Server
+
+on:
+  push:
+    tags:
+      - "*" # Match all tags
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      # 1. Checkout the code
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      # 2. Set up Java and Maven
+      - name: Set up JDK (Eclipse Temurin)
+        uses: actions/setup-java@v3
+        with:
+          distribution: "temurin"
+          java-version: "17"
+          cache: maven
+
+      # 3. Verify Maven installation
+      - name: Install Maven
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y maven
+          mvn -version
+
+      # 4. Build the Spring Boot application
+      - name: Build Spring Boot Application
+        run: |
+          mvn clean package -DskipTests
+
+      # 5. Set up Docker
+      - name: Set up Docker
+        run: |
+          docker --version
+
+      # 6. Extract the tag name
+      - name: Extract Tag Version
+        id: extract_version
+        run: |
+          TAG_VERSION=$(echo "${GITHUB_REF}" | sed 's#refs/tags/##')
+          if [ -z "$TAG_VERSION" ]; then
+            echo "Error: TAG_VERSION is empty."
+            exit 1
+          fi
+          echo "TAG_VERSION=$TAG_VERSION" >> $GITHUB_ENV
+
+          # Extract major and minor versions
+          MAJOR_VERSION=$(echo "${TAG_VERSION}" | cut -d. -f1)
+          MINOR_VERSION=$(echo "${TAG_VERSION}" | cut -d. -f1,2)
+          echo "MAJOR_VERSION=$MAJOR_VERSION" >> $GITHUB_ENV
+          echo "MINOR_VERSION=$MINOR_VERSION" >> $GITHUB_ENV
+
+      # 7. Build the Docker image with the tag
+      - name: Build and Package Docker Image
+        run: |
+          docker build -t tea.zendric.de/cedric/xpensely-server:${{ env.TAG_VERSION }} .
+
+      # 8. Tag the image with Major Version (e.g., 0)
+      - name: Tag with Major Version
+        run: |
+          docker tag tea.zendric.de/cedric/xpensely-server:${{ env.TAG_VERSION }} tea.zendric.de/cedric/xpensely-server:${{ env.MAJOR_VERSION }}
+
+      # 9. Tag the image with Minor Version (e.g., 0.1)
+      - name: Tag with Minor Version
+        run: |
+          docker tag tea.zendric.de/cedric/xpensely-server:${{ env.TAG_VERSION }} tea.zendric.de/cedric/xpensely-server:${{ env.MINOR_VERSION }}
+
+      # 10. Docker login
+      - name: Login to Docker Registry
+        run: |
+          echo "${{ secrets.TEAPASSWORD }}" | docker login tea.zendric.de -u ${{ secrets.TEAUSER }} --password-stdin
+
+      # 11. Push the Docker images with the tags
+      - name: Push the Docker Image to registry
+        run: |
+          docker push tea.zendric.de/cedric/xpensely-server:${{ env.TAG_VERSION }}
+          docker push tea.zendric.de/cedric/xpensely-server:${{ env.MAJOR_VERSION }}
+          docker push tea.zendric.de/cedric/xpensely-server:${{ env.MINOR_VERSION }}

.gitea/workflows/test.yml

@@ -1,46 +0,0 @@
-name: Build and Deploy Spring Boot Server
-
-on:
-  push:
-    branches:
-      - dev
-
-jobs:
-  build:
-    runs-on: self-hosted
-
-    steps:
-      # 1. Checkout the code
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      # 2. Set up Java and Maven
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          java-version: "17"
-
-      - name: Verify Maven installation
-        run: |
-          mvn -version
-
-      # 3. Build the Spring Boot application
-      - name: Build Spring Boot Application
-        run: |
-          mvn clean package -DskipTests
-
-      # 4. Set up Docker
-      - name: Set up Docker
-        run: |
-          docker --version
-          docker-compose --version
-
-      # 5. Build the Docker image using docker-compose
-      - name: Build and Package Docker Image
-        run: |
-          docker-compose build
-
-      # 6. Start the application with dependencies
-      - name: Start the Docker Compose Application
-        run: |
-          docker-compose up -d

dev-docker-compose.yml

@@ -0,0 +1,52 @@
+version: "3.8"
+services:
+  xpensely-server:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: xpensely-server:local
+    labels:
+      net.unraid.docker.icon: https://tea.zendric.de/Cedric/XpenselyServer/raw/branch/main/src/main/resources/static/xpensely_icon_white.png
+    container_name: xpensely-server
+    ports:
+      - 3636:8080
+    environment:
+      GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID}
+      GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET}
+      DB_PORT: 5432
+      DB_P_NAME: xpensely
+      DB_USERNAME: ${DB_USERNAME}
+      DB_PASSWORD: ${DB_PASSWORD}
+      SPRING_PROFILES_ACTIVE: test
+    depends_on:
+      postgresdb:
+        condition: service_healthy
+    networks:
+      - xpensely-network
+  postgresdb:
+    labels:
+      net.unraid.docker.icon: https://raw.githubusercontent.com/docker-library/docs/01c12653951b2fe592c1f93a13b4e289ada0e3a1/postgres/logo.png
+    image: postgres:14
+    container_name: postgresdb
+    ports:
+      - 5435:5432
+    environment:
+      POSTGRES_DB: xpensely
+      POSTGRES_USER: ${DB_USERNAME}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+    networks:
+      - xpensely-network
+    volumes:
+      - db_data:/var/lib/postgresql/data
+    restart: unless-stopped
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - pg_isready -U ${DB_USERNAME} -d xpensely
+      interval: 10s
+      timeout: 5s
+      retries: 5
+volumes:
+  db_data: null
+networks:
+  xpensely-network: null

docker-compose.yml

@@ -1,30 +1,48 @@
-version: "3"
+version: "3.8"
-
 services:
-  app:
+  xpensely-server:
-    build:
+    image: tea.zendric.de/cedric/xpensely-server:0
-      context: .
+    labels:
-      dockerfile: Dockerfile
+      net.unraid.docker.icon: https://tea.zendric.de/Cedric/XpenselyServer/raw/branch/main/src/main/resources/static/xpensely_icon_white.png
-    container_name: XpenselyServer
+    container_name: xpensely-server
     ports:
-      - "8080:8080"
+      - 3636:8080
     environment:
       GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID}
       GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET}
       DB_PORT: 5432
-      DB_CONTAINER: ${DB_P_CONTAINER}
+      DB_P_NAME: xpensely
-      DB_NAME: ${DB_P_NAME}
       DB_USERNAME: ${DB_USERNAME}
       DB_PASSWORD: ${DB_PASSWORD}
     depends_on:
-      - postgresdb
-
       postgresdb:
+        condition: service_healthy
+    networks:
+      - xpensely-network
+  postgresdb:
+    labels:
+      net.unraid.docker.icon: https://raw.githubusercontent.com/docker-library/docs/01c12653951b2fe592c1f93a13b4e289ada0e3a1/postgres/logo.png
     image: postgres:14
     container_name: postgresdb
     ports:
-      - "5432:5432"
+      - 5435:5432
     environment:
-      POSTGRES_DB: ${DB_P_NAME}
+      POSTGRES_DB: xpensely
       POSTGRES_USER: ${DB_USERNAME}
       POSTGRES_PASSWORD: ${DB_PASSWORD}
+    networks:
+      - xpensely-network
+    volumes:
+      - db_data:/var/lib/postgresql/data
+    restart: unless-stopped
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - pg_isready -U ${DB_USERNAME} -d xpensely
+      interval: 10s
+      timeout: 5s
+      retries: 5
+volumes:
+  db_data: null
+networks:
+  xpensely-network: null

dockerfile

@@ -4,4 +4,4 @@ COPY ./target/*.jar app.jar
 
 EXPOSE 8080
 
-ENTRYPOINT ["java", "-jar", "app.jar"]
+ENTRYPOINT ["java","-jar", "app.jar"]

pom.xml

@@ -50,11 +50,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>io.github.cdimascio</groupId>
-			<artifactId>dotenv-java</artifactId>
-			<version>3.1.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>

src/main/java/de/zendric/app/xpensely_server/XpenselyServerApplication.java

@@ -4,20 +4,11 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-import io.github.cdimascio.dotenv.Dotenv;
-
 @SpringBootApplication
 @EnableScheduling
 public class XpenselyServerApplication {
 
 	public static void main(String[] args) {
-		Dotenv dotenv = Dotenv.load(); // Loads the .env file
-		System.setProperty("GOOGLE_CLIENT_ID", dotenv.get("GOOGLE_CLIENT_ID"));
-		System.setProperty("GOOGLE_CLIENT_SECRET", dotenv.get("GOOGLE_CLIENT_SECRET"));
-		System.setProperty("DB_USERNAME", dotenv.get("DB_USERNAME"));
-		System.setProperty("DB_PASSWORD", dotenv.get("DB_PASSWORD"));
-		System.setProperty("DB_DEV_CONTAINER", dotenv.get("DB_DEV_CONTAINER"));
-		System.setProperty("DB_DEV_NAME", dotenv.get("DB_DEV_NAME"));
 		SpringApplication.run(XpenselyServerApplication.class, args);
 	}
 

src/main/java/de/zendric/app/xpensely_server/controller/AppUserController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import de.zendric.app.xpensely_server.model.AppUser;
 import de.zendric.app.xpensely_server.model.AppUserCreateRequest;
-import de.zendric.app.xpensely_server.model.UsernameAlreadyExistsException;
+import de.zendric.app.xpensely_server.model.Exception.UsernameAlreadyExistsException;
 import de.zendric.app.xpensely_server.services.UserService;
 
 @RestController

src/main/java/de/zendric/app/xpensely_server/controller/ExpenseListController.java

@@ -24,6 +24,8 @@ import de.zendric.app.xpensely_server.model.ExpenseChangeRequest;
 import de.zendric.app.xpensely_server.model.ExpenseInput;
 import de.zendric.app.xpensely_server.model.ExpenseList;
 import de.zendric.app.xpensely_server.model.InviteRequest;
+import de.zendric.app.xpensely_server.model.XpenselyStandardCategories;
+import de.zendric.app.xpensely_server.services.CategoryService;
 import de.zendric.app.xpensely_server.services.ExpenseListService;
 import de.zendric.app.xpensely_server.services.UserService;
 
@@ -33,11 +35,14 @@ class ExpenseListController {
 
     private ExpenseListService expenseListService;
     private UserService userService;
+    private CategoryService categoryService;
 
     @Autowired
-    public ExpenseListController(ExpenseListService expenseListService, UserService userService) {
+    public ExpenseListController(ExpenseListService expenseListService, UserService userService,
+            CategoryService categoryService) {
         this.expenseListService = expenseListService;
         this.userService = userService;
+        this.categoryService = categoryService;
     }
 
     @GetMapping("/all")
@@ -96,6 +101,7 @@ class ExpenseListController {
     }
 
     @PostMapping("/create")
+    // TODO add handling of categories by using DTO
     public ResponseEntity<ExpenseList> create(@RequestBody ExpenseList expenseList) {
         try {
             if (expenseList.getOwner() != null) {
@@ -104,6 +110,8 @@ class ExpenseListController {
                     throw new IllegalArgumentException("Owner does not exist.");
                 }
                 expenseList.setOwner(existingOwner);
+                XpenselyStandardCategories standardCategories = categoryService.getDefaultCategories();
+                expenseList.setXpenselyStandardCategories(standardCategories);
             } else {
                 throw new IllegalArgumentException("Owner is required.");
             }

src/main/java/de/zendric/app/xpensely_server/model/DTO/ExpenseListDTO.java

@@ -0,0 +1,8 @@
+package de.zendric.app.xpensely_server.model.DTO;
+
+public class ExpenseListDTO {
+
+    // TODO should combine the two categories to one;
+
+    // private List<CategoryDTO> availableCategories;
+}

src/main/java/de/zendric/app/xpensely_server/model/Exception/UsernameAlreadyExistsException.java

@@ -1,4 +1,4 @@
-package de.zendric.app.xpensely_server.model;
+package de.zendric.app.xpensely_server.model.Exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

src/main/java/de/zendric/app/xpensely_server/model/Expense.java

@@ -34,7 +34,7 @@ public class Expense {
     private Double amount;
     private Double personalUseAmount;
     private Double otherPersonAmount;
-
+    private String category;
     private LocalDate date;
 
     @ManyToOne

src/main/java/de/zendric/app/xpensely_server/model/ExpenseChangeRequest.java

@@ -18,6 +18,7 @@ public class ExpenseChangeRequest {
     private Double personalUseAmount;
     private Double otherPersonAmount;
     private LocalDate date;
+    private String category;
 
     public Expense convertToExpense(Long userId, ExpenseList expenseList) {
         AppUser appUser = new AppUser();
@@ -33,6 +34,7 @@ public class ExpenseChangeRequest {
         expense.setId(id);
         expense.setOwner(appUser);
         expense.setTitle(title);
+        expense.setCategory(category);
 
         return expense;
     }

src/main/java/de/zendric/app/xpensely_server/model/ExpenseInput.java

@@ -29,6 +29,7 @@ public class ExpenseInput {
     private Double otherPersonAmount;
 
     private LocalDate date;
+    private String category;
 
     private ExpenseList expenseList;
 
@@ -46,6 +47,7 @@ public class ExpenseInput {
         expense.setId(id);
         expense.setOwner(appUser);
         expense.setTitle(title);
+        expense.setCategory(category);
 
         return expense;
     }

src/main/java/de/zendric/app/xpensely_server/model/ExpenseList.java

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -40,6 +41,14 @@ public class ExpenseList {
     @ManyToOne
     private AppUser sharedWith;
 
+    @ManyToOne(fetch = FetchType.EAGER)
+    private XpenselyStandardCategories xpenselyStandardCategories;
+
+    @OneToMany(mappedBy = "expenseList", cascade = CascadeType.ALL, orphanRemoval = true)
+    @JsonManagedReference
+    @jakarta.persistence.OrderBy("name ASC")
+    private List<XpenselyCustomCategory> customCategories;
+
     @OneToMany(mappedBy = "expenseList", cascade = CascadeType.ALL, orphanRemoval = true)
     @JsonManagedReference
     @jakarta.persistence.OrderBy("date ASC, id ASC")

src/main/java/de/zendric/app/xpensely_server/model/XpenselyCustomCategory.java

@@ -0,0 +1,37 @@
+package de.zendric.app.xpensely_server.model;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class XpenselyCustomCategory {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String name;
+
+    @Column(name = "color_code", length = 7, nullable = false)
+    private String colorCode;
+
+    @ManyToOne
+    @JoinColumn(name = "expense_list_id", nullable = false)
+    @JsonBackReference
+    private ExpenseList expenseList;
+}

src/main/java/de/zendric/app/xpensely_server/model/XpenselyStandardCategories.java

@@ -0,0 +1,29 @@
+package de.zendric.app.xpensely_server.model;
+
+import java.util.List;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class XpenselyStandardCategories {
+
+    @Id
+    private Long id;
+
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true)
+    @JoinColumn(name = "global_categories_id")
+    private List<XpenselyStandardCategory> categories;
+}

src/main/java/de/zendric/app/xpensely_server/model/XpenselyStandardCategory.java

@@ -0,0 +1,27 @@
+package de.zendric.app.xpensely_server.model;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class XpenselyStandardCategory {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String name;
+
+    @Column(name = "color_code", length = 7, nullable = false)
+    private String colorCode;
+}

src/main/java/de/zendric/app/xpensely_server/preparation/DataInitializer.java

@@ -0,0 +1,40 @@
+package de.zendric.app.xpensely_server.preparation;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import de.zendric.app.xpensely_server.model.XpenselyStandardCategories;
+import de.zendric.app.xpensely_server.model.XpenselyStandardCategory;
+import de.zendric.app.xpensely_server.repo.XpenselyStandardCategoriesRepository;
+
+@Component
+public class DataInitializer implements CommandLineRunner {
+
+    @Autowired
+    private XpenselyStandardCategoriesRepository globalRepo;
+
+    @Override
+    public void run(String... args) throws Exception {
+        Optional<XpenselyStandardCategories> optional = globalRepo.findById(1L);
+
+        XpenselyStandardCategories global = optional.orElseGet(() -> {
+            XpenselyStandardCategories g = new XpenselyStandardCategories();
+            g.setId(1L);
+            return g;
+        });
+
+        List<XpenselyStandardCategory> categories = List.of(
+                new XpenselyStandardCategory(null, "Food", "#FF5733"),
+                new XpenselyStandardCategory(null, "Transportation", "#33C3FF"),
+                new XpenselyStandardCategory(null, "Entertainment", "#33FF57"),
+                new XpenselyStandardCategory(null, "Shopping", "#FF33A8"),
+                new XpenselyStandardCategory(null, "Household", "#FFC733"),
+                new XpenselyStandardCategory(null, "Other", "#9D33FF"));
+        global.setCategories(categories);
+        globalRepo.save(global);
+    }
+}

src/main/java/de/zendric/app/xpensely_server/repo/XpenselyCustomCategoryRepository.java

@@ -0,0 +1,10 @@
+package de.zendric.app.xpensely_server.repo;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import de.zendric.app.xpensely_server.model.XpenselyCustomCategory;
+
+@Repository
+public interface XpenselyCustomCategoryRepository extends JpaRepository<XpenselyCustomCategory, Long> {
+}

src/main/java/de/zendric/app/xpensely_server/repo/XpenselyStandardCategoriesRepository.java

@@ -0,0 +1,11 @@
+package de.zendric.app.xpensely_server.repo;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import de.zendric.app.xpensely_server.model.XpenselyStandardCategories;
+
+@Repository
+public interface XpenselyStandardCategoriesRepository extends JpaRepository<XpenselyStandardCategories, Long> {
+
+}

src/main/java/de/zendric/app/xpensely_server/security/SecurityConfig.java

@@ -2,6 +2,7 @@ package de.zendric.app.xpensely_server.security;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -10,17 +11,19 @@ import org.springframework.security.web.SecurityFilterChain;
 @Configuration
 @EnableWebSecurity
 public class SecurityConfig {
-        // @Bean
+        @Bean
-        // public SecurityFilterChain securityFilterChain(HttpSecurity http) throws
+        @Profile("test") // Only enable this for testing
-        // Exception {
+        public SecurityFilterChain testSecurityFilterChain(HttpSecurity http) throws Exception {
-        // http.authorizeHttpRequests(auth -> auth
+                http
-        // .anyRequest().permitAll()).csrf().disable();
+                                .authorizeHttpRequests(auth -> auth
-        // ;
+                                                .anyRequest().permitAll())
+                                .csrf().disable();
 
-        // return http.build();
+                return http.build();
-        // }
+        }
 
         @Bean
+        @Profile("!test")
         public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
                 http
                                 .authorizeHttpRequests(auth -> auth

src/main/java/de/zendric/app/xpensely_server/services/CategoryService.java

@@ -0,0 +1,24 @@
+package de.zendric.app.xpensely_server.services;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import de.zendric.app.xpensely_server.model.XpenselyStandardCategories;
+import de.zendric.app.xpensely_server.repo.XpenselyStandardCategoriesRepository;
+
+@Service
+public class CategoryService {
+
+    private final XpenselyStandardCategoriesRepository standardCategoriesRepo;
+
+    @Autowired
+    public CategoryService(XpenselyStandardCategoriesRepository standardCategoriesRepo) {
+        this.standardCategoriesRepo = standardCategoriesRepo;
+    }
+
+    public XpenselyStandardCategories getDefaultCategories() {
+        return standardCategoriesRepo.findById(1L)
+                .orElseThrow(() -> new IllegalStateException("Standard categories not found"));
+    }
+
+}

src/main/java/de/zendric/app/xpensely_server/services/ExpenseListService.java

@@ -14,8 +14,10 @@ import org.springframework.transaction.annotation.Transactional;
 import de.zendric.app.xpensely_server.model.AppUser;
 import de.zendric.app.xpensely_server.model.Expense;
 import de.zendric.app.xpensely_server.model.ExpenseList;
+import de.zendric.app.xpensely_server.model.XpenselyCustomCategory;
 import de.zendric.app.xpensely_server.repo.ExpenseListRepository;
 import de.zendric.app.xpensely_server.repo.ExpenseRepository;
+import de.zendric.app.xpensely_server.repo.XpenselyCustomCategoryRepository;
 import jakarta.persistence.EntityManager;
 
 @Service
@@ -24,14 +26,17 @@ public class ExpenseListService {
 
     private ExpenseListRepository repository;
     private final ExpenseRepository expenseRepository;
+    private XpenselyCustomCategoryRepository customCategoryRepository;
 
     @Autowired
     private EntityManager entityManager;
 
     @Autowired
-    public ExpenseListService(ExpenseListRepository repository, ExpenseRepository expenseRepository) {
+    public ExpenseListService(ExpenseListRepository repository, ExpenseRepository expenseRepository,
+            XpenselyCustomCategoryRepository customCategoryRepository) {
         this.repository = repository;
         this.expenseRepository = expenseRepository;
+        this.customCategoryRepository = customCategoryRepository;
     }
 
     public List<ExpenseList> getAllLists() {
@@ -178,7 +183,28 @@ public class ExpenseListService {
         existingExpense.setOtherPersonAmount(updatedExpense.getOtherPersonAmount());
         existingExpense.setDate(updatedExpense.getDate());
         existingExpense.setOwner(updatedExpense.getOwner());
+        existingExpense.setCategory(updatedExpense.getCategory());
 
         return expenseRepository.save(existingExpense);
     }
+
+    // TODO implement API for this
+    public XpenselyCustomCategory addCustomCategory(Long expenseListId, XpenselyCustomCategory customCategory) {
+        ExpenseList expenseList = repository.findById(expenseListId)
+                .orElseThrow(() -> new RuntimeException("Expense List not found"));
+        customCategory.setExpenseList(expenseList);
+
+        return customCategoryRepository.save(customCategory);
+    }
+
+    // TODO implement API for this
+    public void deleteCustomCategory(Long expenseListId, Long categoryId) {
+        XpenselyCustomCategory category = customCategoryRepository.findById(categoryId)
+                .orElseThrow(() -> new RuntimeException("Custom Category not found"));
+        if (!category.getExpenseList().getId().equals(expenseListId)) {
+            throw new RuntimeException("Category does not belong to the specified Expense List");
+        }
+        customCategoryRepository.delete(category);
+    }
+
 }

src/main/java/de/zendric/app/xpensely_server/services/UserService.java

@@ -6,7 +6,7 @@ import java.util.Optional;
 import org.springframework.stereotype.Service;
 
 import de.zendric.app.xpensely_server.model.AppUser;
-import de.zendric.app.xpensely_server.model.UsernameAlreadyExistsException;
+import de.zendric.app.xpensely_server.model.Exception.UsernameAlreadyExistsException;
 import de.zendric.app.xpensely_server.repo.UserRepository;
 
 @Service

src/main/resources/application.properties

@@ -8,7 +8,7 @@ spring.security.oauth2.client.registration.google.client-secret=${GOOGLE_CLIENT_
 spring.security.oauth2.resourceserver.jwt.issuer-uri=https://accounts.google.com
 
 # PostgreSQL Configuration
-spring.datasource.url=jdbc:postgresql://${DB_DEV_CONTAINER}:5432/${DB_DEV_NAME}
+spring.datasource.url=jdbc:postgresql://postgresdb:${DB_PORT}/${DB_P_NAME}
 spring.datasource.username=${DB_USERNAME}
 spring.datasource.password=${DB_PASSWORD}
 spring.datasource.driver-class-name=org.postgresql.Driver

src/test/java/de/zendric/app/xpensely_Server/ExpenseListRepositoryTest.java

@@ -0,0 +1,26 @@
+package de.zendric.app.xpensely_Server;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+
+import de.zendric.app.xpensely_server.model.ExpenseList;
+import de.zendric.app.xpensely_server.repo.ExpenseListRepository;
+
+@DataJpaTest
+class ExpenseListRepositoryTest {
+
+        @Autowired
+        private ExpenseListRepository expenseListRepository;
+
+        @Test
+        void testFindExpenseListById() {
+                // Assuming an ExpenseList with id = 1 exists in your test DB.
+                Optional<ExpenseList> optionalExpenseList = expenseListRepository.findById(1L);
+
+                ExpenseList expenseList = optionalExpenseList.get();
+                System.out.println("ExpenseList name: " + expenseList.getName());
+        }
+}

src/test/java/de/zendric/app/xpensely_Server/XpenselyServerApplicationTests.java

@@ -1,13 +0,0 @@
-package de.zendric.app.xpensely_Server;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class XpenselyServerApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}