Merge pull request #48 from Halbes-Byte/feature/chapter

Feature/chapter

Author: Daenges

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: db
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: pass
+    volumes:
+      - app_postgres_data:/var/lib/postgresql/data
 ######################################################
 volumes:
   postgres_data:
+  app_postgres_data:

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>

server/src/main/java/com/studybuddies/server/domain/ChapterEntity.java

@@ -0,0 +1,30 @@
+package com.studybuddies.server.domain;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Setter
+@Getter
+@RequiredArgsConstructor
+public class ChapterEntity {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
+  private String title;
+
+  @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+  @JoinColumn(name = "chapter_id")
+  private List<CheckboxEntity> checkbox = new ArrayList<>();
+}

server/src/main/java/com/studybuddies/server/domain/CheckboxEntity.java

@@ -0,0 +1,27 @@
+package com.studybuddies.server.domain;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.validation.constraints.NotBlank;
+import java.util.UUID;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+@RequiredArgsConstructor
+@Entity
+@Data
+@Setter
+public class CheckboxEntity {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.UUID)
+  private UUID id;
+  @NotBlank
+  private String title;
+  private boolean checked;
+
+  private UUID userUuid;
+}

server/src/main/java/com/studybuddies/server/domain/UserEntity.java

@@ -1,11 +1,12 @@
 package com.studybuddies.server.domain;
 
-import jakarta.persistence.CollectionTable;
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
-import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import lombok.Getter;
@@ -24,8 +25,7 @@ public class UserEntity {
   @Column(unique = true, nullable = false)
   String username;
 
-  @ElementCollection
-  @CollectionTable(name = "userModules", joinColumns = @JoinColumn(name = "userUuid"))
-  @Column(name = "moduleName")
-  private List<String> modules;
+  @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+  @JoinColumn(name = "user_uuid")
+  private List<UserModule> modules = new ArrayList<>();
 }

server/src/main/java/com/studybuddies/server/domain/UserModule.java

@@ -0,0 +1,35 @@
+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.OneToMany;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+public class UserModule {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(nullable = false, updatable = false)
+  private Long id;
+
+  private String name;
+  private String examDate;
+  private String examLoc;
+
+  @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+  @JoinColumn(name = "module_id")
+  private List<ChapterEntity> chapter = new ArrayList<>();
+}

server/src/main/java/com/studybuddies/server/persistance/ChapterRepository.java

@@ -0,0 +1,10 @@
+package com.studybuddies.server.persistance;
+
+import com.studybuddies.server.domain.ChapterEntity;
+import java.util.UUID;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ChapterRepository extends CrudRepository<ChapterEntity, UUID> {
+}

server/src/main/java/com/studybuddies/server/persistance/CheckboxRepository.java

@@ -0,0 +1,12 @@
+package com.studybuddies.server.persistance;
+
+import com.studybuddies.server.domain.CheckboxEntity;
+import java.util.List;
+import java.util.UUID;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CheckboxRepository extends CrudRepository<CheckboxEntity, UUID> {
+  List<CheckboxEntity> findByUserUuid(UUID userUuid);
+}

server/src/main/java/com/studybuddies/server/persistance/MeetingRepository.java

@@ -4,7 +4,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;

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> {
+
+}