Merge branch 'feat/user-svc' into feat/concept-svc

Author: lennyStreavent

compose.aws.yml

@@ -38,6 +38,26 @@ services:
       - "8081:8080"
     environment:
       - SPRING_PROFILES_ACTIVE=docker
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://user-svc-db:5432/eventdb
+      - SPRING_DATASOURCE_USERNAME=postgres
+      - SPRING_DATASOURCE_PASSWORD=postgres
+      - SPRING_JPA_HIBERNATE_DDL_AUTO=update
+      - SPRING_JPA_SHOW_SQL=true
+      - SPRING_JPA_PROPERTIES_HIBERNATE_FORMAT_SQL=true
+    networks:
+      - backend-network
+    depends_on:
+      - user-svc-db
+    restart: unless-stopped
+
+  user-svc-db:
+    image: postgres:15
+    ports:
+      - "5432:5432"
+    environment:
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_USER=postgres
+      - POSTGRES_DB=eventdb
     networks:
       - backend-network
     restart: unless-stopped
@@ -88,4 +108,4 @@ networks:
   frontend-network:
     driver: bridge
   backend-network:
-    driver: bridge 
+    driver: bridge 

docker-compose.yml

@@ -38,8 +38,29 @@ services:
       - "8081:8080"
     environment:
       - SPRING_PROFILES_ACTIVE=docker
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://user-svc-db:5432/eventdb
+      - SPRING_DATASOURCE_USERNAME=postgres
+      - SPRING_DATASOURCE_PASSWORD=postgres
+      - SPRING_JPA_HIBERNATE_DDL_AUTO=update
+      - SPRING_JPA_SHOW_SQL=true
+      - SPRING_JPA_PROPERTIES_HIBERNATE_FORMAT_SQL=true
     networks:
       - backend-network
+    depends_on:
+      - user-svc-db
+
+  user-svc-db:
+    image: postgres:15
+    ports:
+      - "5432:5432"
+    environment:
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_USER=postgres
+      - POSTGRES_DB=eventdb
+    networks:
+      - backend-network
+    #volumes:
+      #- eventdb_data:/var/lib/postgresql/data
 
   # Concept Service (Spring Boot)
   concept-svc:

helm/ai-event-concepter/templates/user-svc-db-deployment.yaml

@@ -0,0 +1,38 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: user-svc-db
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: user-svc-db-selector
+  template:
+    metadata:
+      labels:
+        app: user-svc-db-selector
+    spec:
+      containers:
+        - name: user-svc-db
+          image: "{{ .Values.userdb.image.repository }}:{{ .Values.userdb.image.tag }}"
+          imagePullPolicy: {{ .Values.userdb.image.pullPolicy }}
+          resources:
+            limits:
+              cpu: {{ .Values.userdb.resources.limits.cpu | quote }}
+              memory: {{ .Values.userdb.resources.limits.memory | quote }}
+            requests:
+              cpu: {{ .Values.userdb.resources.requests.cpu | quote }}
+              memory: {{ .Values.userdb.resources.requests.memory | quote }}
+          ports:
+            - containerPort: {{ .Values.userdb.service.targetPort }}
+          env:
+            {{- range .Values.userdb.env }}
+            - name: {{ .name }}
+              value: "{{ .value }}"
+            {{- end }}
+          volumeMounts:
+            - name: user-svc-db-data
+              mountPath: /var/lib/postgresql/data
+      volumes:
+        - name: user-svc-db-data
+          emptyDir: {}

helm/ai-event-concepter/templates/user-svc-db-service.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: user-svc-db
+spec:
+  selector:
+    app: user-svc-db-selector
+  ports:
+    - port: {{ .Values.userdb.service.port }}
+      targetPort: {{ .Values.userdb.service.targetPort }}
+  type: {{ .Values.userdb.service.type }}

helm/ai-event-concepter/values.yaml

@@ -49,6 +49,18 @@ usersvc:
   env:
     - name: SPRING_PROFILES_ACTIVE
       value: docker
+    - name: SPRING_DATASOURCE_URL
+      value: jdbc:postgresql://user-svc-db:5432/eventdb
+    - name: SPRING_DATASOURCE_USERNAME
+      value: postgres
+    - name: SPRING_DATASOURCE_PASSWORD
+      value: postgres
+    - name: SPRING_JPA_HIBERNATE_DDL_AUTO
+      value: update
+    - name: SPRING_JPA_SHOW_SQL
+      value: "true"
+    - name: SPRING_JPA_PROPERTIES_HIBERNATE_FORMAT_SQL
+      value: "true"
 
 conceptsvc:
   image:
@@ -90,6 +102,30 @@ genaisvc:
     - name: FLASK_ENV
       value: production
 
+userdb:
+  image:
+    repository: postgres
+    tag: "15"
+    pullPolicy: IfNotPresent
+  service:
+    type: ClusterIP
+    port: 5432
+    targetPort: 5432
+  resources:
+    limits:
+      cpu: "500m"
+      memory: "512Mi"
+    requests:
+      cpu: "200m"
+      memory: "256Mi"
+  env:
+    - name: POSTGRES_PASSWORD
+      value: postgres
+    - name: POSTGRES_USER
+      value: postgres
+    - name: POSTGRES_DB
+      value: eventdb
+
 conceptdb:
   image:
     repository: postgres

user-svc/build.gradle

@@ -19,9 +19,15 @@ repositories {
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
-	implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
+	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	runtimeOnly 'org.postgresql:postgresql'
 	implementation 'io.swagger.core.v3:swagger-annotations:2.2.20'
 	implementation 'jakarta.validation:jakarta.validation-api:3.0.2'
+	implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
+	implementation 'org.springframework.boot:spring-boot-starter-security'
+	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+	runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+	runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }

user-svc/src/main/java/de/tum/aet/devops25/usersvc/CustomAuthenticationEntryPoint.java

@@ -0,0 +1,55 @@
+package de.tum.aet.devops25.usersvc;
+
+import java.io.IOException;
+import java.time.OffsetDateTime;
+
+import org.springframework.http.MediaType;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.stereotype.Component;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import de.tum.aet.devops25.api.generated.model.ErrorResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+@Component
+public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint {
+
+    private final ObjectMapper objectMapper;
+
+    public CustomAuthenticationEntryPoint(ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+    }
+
+    @Override
+    public void commence(HttpServletRequest request, HttpServletResponse response,
+            AuthenticationException authException) throws IOException, ServletException {
+
+        String requestURI = request.getRequestURI();
+        String authHeader = request.getHeader("Authorization");
+
+        ErrorResponse error;
+        if (authHeader == null || authHeader.isEmpty()) {
+            error = new ErrorResponse()
+                    .error("MISSING_TOKEN")
+                    .message("Authentication token is required")
+                    .path(requestURI)
+                    .status(401)
+                    .timestamp(OffsetDateTime.now());
+        } else {
+            error = new ErrorResponse()
+                    .error("INVALID_TOKEN")
+                    .message("Invalid or expired authentication token")
+                    .path(requestURI)
+                    .status(401)
+                    .timestamp(OffsetDateTime.now());
+        }
+
+        response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+        response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+        response.getWriter().write(objectMapper.writeValueAsString(error));
+    }
+}

user-svc/src/main/java/de/tum/aet/devops25/usersvc/DefaultController.java

@@ -0,0 +1,63 @@
+package de.tum.aet.devops25.usersvc;
+
+import java.time.OffsetDateTime;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.context.request.WebRequest;
+
+import de.tum.aet.devops25.api.generated.model.ErrorResponse;
+
+@ControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ExceptionHandler(UserAlreadyExistsException.class)
+    public ResponseEntity<ErrorResponse> handleUserAlreadyExistsException(UserAlreadyExistsException ex, WebRequest request) {
+        ErrorResponse error = new ErrorResponse()
+                .error("USER_ALREADY_EXISTS")
+                .message(ex.getMessage())
+                .path(request.getDescription(false).replace("uri=", ""))
+                .status(409)
+                .timestamp(OffsetDateTime.now());
+
+        return ResponseEntity.status(HttpStatus.CONFLICT).body(error);
+    }
+
+    @ExceptionHandler(RuntimeException.class)
+    public ResponseEntity<ErrorResponse> handleRuntimeException(RuntimeException ex, WebRequest request) {
+        ErrorResponse error = new ErrorResponse()
+                .error("RUNTIME_ERROR")
+                .message(ex.getMessage())
+                .path(request.getDescription(false).replace("uri=", ""))
+                .status(500)
+                .timestamp(OffsetDateTime.now());
+
+        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
+    }
+
+    @ExceptionHandler(Exception.class)
+    public ResponseEntity<ErrorResponse> handleGenericException(Exception ex, WebRequest request) {
+        ErrorResponse error = new ErrorResponse()
+                .error("INTERNAL_SERVER_ERROR")
+                .message("An unexpected error occurred")
+                .path(request.getDescription(false).replace("uri=", ""))
+                .status(500)
+                .timestamp(OffsetDateTime.now());
+
+        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
+    }
+
+    @ExceptionHandler(IllegalArgumentException.class)
+    public ResponseEntity<ErrorResponse> handleIllegalArgumentException(IllegalArgumentException ex, WebRequest request) {
+        ErrorResponse error = new ErrorResponse()
+                .error("VALIDATION_ERROR")
+                .message(ex.getMessage())
+                .path(request.getDescription(false).replace("uri=", ""))
+                .status(400)
+                .timestamp(OffsetDateTime.now());
+
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error);
+    }
+}

user-svc/src/main/java/de/tum/aet/devops25/usersvc/GlobalExceptionHandler.java

@@ -0,0 +1,22 @@
+package de.tum.aet.devops25.usersvc;
+
+import org.openapitools.jackson.nullable.JsonNullableModule;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+@Configuration
+public class JacksonConfig {
+
+    @Bean
+    public ObjectMapper objectMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.registerModule(new JavaTimeModule());
+        mapper.registerModule(new JsonNullableModule());
+        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        return mapper;
+    }
+}