Fix domain schema and migrate to postgres

Konstantin Pankratov · Konstantin Pankratov · commit d0ab794429ee · 2025-06-25T10:50:03.000+02:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,17 +7,13 @@ services:
       KC_DB_URL: jdbc:postgresql://keycloakdb1:5432/keycloak
       KC_DB_USERNAME: ${KC_DB_USERNAME}
       KC_DB_PASSWORD: ${KC_DB_PASSWORD}
-
       KEYCLOAK_ADMIN: ${KC_DB_USERNAME}
       KEYCLOAK_ADMIN_PASSWORD: pass
-
-
       KC_HOSTNAME: localhost
       KC_HOSTNAME_PORT: 8080
       KC_HOSTNAME_STRICT: 'false'
       KC_HOSTNAME_STRICT_HTTPS: 'false'
       KC_LOG_LEVEL: debug
-
       KC_METRICS_ENABLED: 'true'
       KC_HEALTH_ENABLED: 'true'
       KC_PROXY: edge
@@ -38,6 +34,21 @@ services:
       POSTGRES_PASSWORD: ${KC_DB_PASSWORD}
     ports:
       - '5432:5432'
+######################################################
+  # Spring Boot App PostgreSQL Database
+  app_postgres:
+    image: postgres:15-alpine
+    container_name: app-postgres-db
+    restart: unless-stopped
+    ports:
+      - "6543:5432"
+    environment:
+      POSTGRES_DB: myapp_db
+      POSTGRES_USER: myapp_user
+      POSTGRES_PASSWORD: myapp_password
+    volumes:
+      - app_postgres_data:/var/lib/postgresql/data
 ######################################################
 volumes:
   postgres_data:
+  app_postgres_data:
diff --git a/server/pom.xml b/server/pom.xml
@@ -118,6 +118,12 @@
 				<version>6.4.2</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
diff --git a/server/src/main/java/com/studybuddies/server/domain/ChapterEntity.java b/server/src/main/java/com/studybuddies/server/domain/ChapterEntity.java
@@ -8,8 +8,8 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -21,12 +21,12 @@
 public class ChapterEntity {
 
   @Id
-  @GeneratedValue(strategy = GenerationType.UUID)
-  private UUID id;
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
   private String title;
 
   @OneToMany(mappedBy = "chapter", cascade = CascadeType.ALL, orphanRemoval = true)
-  private List<CheckboxEntity> checkbox;
+  private List<CheckboxEntity> checkbox = new ArrayList<>();
 
   @ManyToOne
   @JoinColumn(name = "module_id")
diff --git a/server/src/main/java/com/studybuddies/server/domain/CheckboxEntity.java b/server/src/main/java/com/studybuddies/server/domain/CheckboxEntity.java
@@ -7,7 +7,6 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.validation.constraints.NotBlank;
-import java.util.UUID;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -19,8 +18,8 @@
 public class CheckboxEntity {
 
   @Id
-  @GeneratedValue(strategy = GenerationType.UUID)
-  private UUID id;
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
   @NotBlank
   private String title;
   private boolean checked;
diff --git a/server/src/main/java/com/studybuddies/server/domain/UserEntity.java b/server/src/main/java/com/studybuddies/server/domain/UserEntity.java
@@ -5,6 +5,7 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import lombok.Getter;
@@ -24,5 +25,5 @@ public class UserEntity {
   String username;
 
   @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
-  private List<UserModule> modules;
+  private List<UserModule> modules = new ArrayList<>();
 }
diff --git a/server/src/main/java/com/studybuddies/server/domain/UserModule.java b/server/src/main/java/com/studybuddies/server/domain/UserModule.java
@@ -1,12 +1,15 @@
 package com.studybuddies.server.domain;
 
 import jakarta.persistence.CascadeType;
+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 jakarta.persistence.OneToMany;
+import java.util.ArrayList;
 import java.util.List;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -19,15 +22,16 @@
 public class UserModule {
 
   @Id
-  @GeneratedValue
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(nullable = false, updatable = false)
   private Long id;
 
   private String name;
   private String examDate;
   private String examLoc;
 
   @OneToMany(mappedBy = "module", cascade = CascadeType.ALL, orphanRemoval = true)
-  private List<ChapterEntity> chapter;
+  private List<ChapterEntity> chapter = new ArrayList<>();
 
   @ManyToOne
   @JoinColumn(name = "user_uuid")
diff --git a/server/src/main/java/com/studybuddies/server/persistance/UserModuleRepository.java b/server/src/main/java/com/studybuddies/server/persistance/UserModuleRepository.java
@@ -0,0 +1,8 @@
+package com.studybuddies.server.persistance;
+
+import com.studybuddies.server.domain.UserModule;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface UserModuleRepository extends JpaRepository<UserModule, Long> {
+
+}
diff --git a/server/src/main/java/com/studybuddies/server/services/user/UserService.java b/server/src/main/java/com/studybuddies/server/services/user/UserService.java
@@ -5,8 +5,10 @@
 import com.studybuddies.server.domain.Filter;
 import com.studybuddies.server.domain.UserEntity;
 import com.studybuddies.server.domain.UserModule;
+import com.studybuddies.server.persistance.UserModuleRepository;
 import com.studybuddies.server.persistance.UserRepository;
 import com.studybuddies.server.services.UUIDService;
+import com.studybuddies.server.services.exceptions.ModuleNotFoundException;
 import com.studybuddies.server.services.exceptions.UserAccountSetupNotFinished;
 import com.studybuddies.server.services.exceptions.UsernameAlreadyTakenException;
 import com.studybuddies.server.services.interfaces.CRUDService;
@@ -19,11 +21,10 @@
 import com.studybuddies.server.web.mapper.UserModuleMapper;
 import com.studybuddies.server.web.mapper.exceptions.AccountSetupAlreadyFinished;
 import jakarta.transaction.Transactional;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.Random;
 import java.util.UUID;
-import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.NotImplementedException;
 import org.springframework.stereotype.Service;
@@ -37,6 +38,7 @@ public class UserService implements
   private final UserMapper userMapper;
   private final UserModuleMapper userModuleMapper;
   private final ModuleValidationService moduleValidationService;
+  private final UserModuleRepository userModuleRepository;
 
   @Override
   public List<UserResponse> get(String userUUID, Filter filter) {
@@ -91,22 +93,6 @@ public boolean existsByUUID(UUID uuid) {
     return userRepository.existsById(uuid);
   }
 
-  @Transactional
-  public void Old_updateModules(List<UserModuleReq> moduleUpdateRequest, String uuid) {
-    var foundModules = moduleUpdateRequest.stream()
-        .map(UserModuleReq::getName)
-        .filter(moduleValidationService::exists)
-        .map(String::toUpperCase)
-        .collect(Collectors.toCollection(ArrayList::new));
-
-    Optional<UserEntity> target = userRepository.findById(UUIDService.parseUUID(uuid));
-    if (target.isEmpty()) {
-      throw new UserAccountSetupNotFinished("User not found");
-    }
-    //target.get().setModules(foundModules);
-    userRepository.save(target.get());
-  }
-
   @Transactional
   public void updateModules(List<UserModuleReq> moduleUpdateRequest, String uuidStr) {
     UUID uuid = UUID.fromString(uuidStr);
@@ -116,21 +102,27 @@ public void updateModules(List<UserModuleReq> moduleUpdateRequest, String uuidSt
     user.getModules().clear();
 
     for (UserModuleReq req : moduleUpdateRequest) {
-      if (!moduleValidationService.exists(req.getName())) continue;
+      if (!moduleValidationService.exists(req.getName())) throw new ModuleNotFoundException("");
 
       UserModule module = userModuleMapper.of(req);
       module.setUser(user);
 
-      for (ChapterEntity chapter : module.getChapter()) {
-        chapter.setModule(module);
-        for (CheckboxEntity cb : chapter.getCheckbox()) {
-          cb.setChapter(chapter);
+      if (module.getChapter() != null) {
+        for (ChapterEntity chapter : module.getChapter()) {
+          module.setName(module.getName().toUpperCase());
+          chapter.setModule(module);
+
+          if (chapter.getCheckbox() != null) {
+            for (CheckboxEntity cb : chapter.getCheckbox()) {
+              cb.setChapter(chapter);
+            }
+          }
         }
       }
 
       user.getModules().add(module);
+      userModuleRepository.save(module);
     }
-
     userRepository.save(user);
   }
 }
diff --git a/server/src/main/java/com/studybuddies/server/web/dto/chapter/ChapterCreationRequest.java b/server/src/main/java/com/studybuddies/server/web/dto/chapter/ChapterCreationRequest.java
@@ -1,7 +1,9 @@
 package com.studybuddies.server.web.dto.chapter;
 
 import com.studybuddies.server.web.dto.interfaces.CreationRequest;
+import lombok.Getter;
 
+@Getter
 public class ChapterCreationRequest implements CreationRequest {
   private String title;
   private CheckboxCreationRequest[] checkbox;
diff --git a/server/src/main/java/com/studybuddies/server/web/mapper/ChapterMapper.java b/server/src/main/java/com/studybuddies/server/web/mapper/ChapterMapper.java
@@ -7,8 +7,9 @@
 
 @Mapper(componentModel = "spring", uses = {CheckboxMapper.class})
 public interface ChapterMapper {
-
   @Mapping(target = "id", ignore = true)
   @Mapping(target = "module", ignore = true)
+  @Mapping(target = "checkbox", source = "checkbox")
   ChapterEntity of(ChapterCreationRequest dto);
 }
+
diff --git a/server/src/main/java/com/studybuddies/server/web/mapper/UserModuleMapper.java b/server/src/main/java/com/studybuddies/server/web/mapper/UserModuleMapper.java
@@ -7,9 +7,9 @@
 
 @Mapper(componentModel = "spring", uses = {ChapterMapper.class})
 public interface UserModuleMapper {
-
   @Mapping(target = "id", ignore = true)
   @Mapping(target = "user", ignore = true)
   @Mapping(target = "chapter", source = "chapter")
   UserModule of(UserModuleReq dto);
 }
+
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
@@ -4,17 +4,15 @@ spring:
     application:
         name: server
     datasource:
-        url: jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-        username: ${H2_USERNAME:user}
-        password: ${H2_PASSWORD:password}
-        driverClassName: org.h2.Driver
+        url: jdbc:postgresql://localhost:6543/myapp_db
+        username: postgres
+        password: pass
+        driverClassName: org.postgresql.Driver
     jpa:
-        database-platform: org.hibernate.dialect.H2Dialect
+        database-platform: org.hibernate.dialect.PostgreSQLDialect
         show-sql: true
         hibernate:
-            ddl-auto: create
-    h2:
-        console.enabled: true
+            ddl-auto: create-drop
     security:
         oauth2:
             client:
@@ -24,4 +22,10 @@ spring:
                 provider.keycloak.issuer-uri: http://localhost:7070/realms/study-buddies
             resourceserver.jwt.issuer-uri: http://localhost:7070/realms/study-buddies
 springdoc:
-    swagger-ui.path: /api-docs
+    swagger-ui.path: /api-docs
+
+logging:
+    level:
+        org.hibernate.SQL: DEBUG
+        org.hibernate.type.descriptor.sql.BasicBinder: TRACE
+        org.springframework.transaction: DEBUG
