Merge pull request #35 from Halbes-Byte/feature/modules

Implement Modules for

Author: Daenges

.DS_Store

@@ -219,7 +219,7 @@ elif set_java_home; then
   "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
 fi
 
-# If specified, validate the SHA-256 sum of the Maven distribution zip file
+# If specified, exists the SHA-256 sum of the Maven distribution zip file
 if [ -n "${distributionSha256Sum-}" ]; then
   distributionSha256Result=false
   if [ "$MVN_CMD" = mvnd.sh ]; then

server/.DS_Store

@@ -109,7 +109,7 @@
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-core</artifactId>
-			<version>6.4.2</version>
+			<version>6.4.4</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-web -->
 		<dependency>

server/mvnw

@@ -0,0 +1,20 @@
+package com.studybuddies.server.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.validation.constraints.Size;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Getter
+@Setter
+@RequiredArgsConstructor
+public class ModuleEntity {
+  @Id
+  @Size(min = 5, max = 50, message = "Please provide the entire module name")
+  @Column(nullable = false, unique = true)
+  String name;
+}

server/pom.xml

@@ -1,8 +1,12 @@
 package com.studybuddies.server.domain;
 
+import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import java.util.List;
 import java.util.UUID;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -19,4 +23,9 @@ 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;
 }

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

@@ -0,0 +1,9 @@
+package com.studybuddies.server.persistance;
+
+import com.studybuddies.server.domain.ModuleEntity;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ModuleRepository extends CrudRepository<ModuleEntity, String> {
+}

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

@@ -9,9 +9,9 @@
 import com.studybuddies.server.services.interfaces.CRUDService;
 import com.studybuddies.server.services.meeting.MeetingService;
 import com.studybuddies.server.services.user.UserService;
-import com.studybuddies.server.web.dto.StudyGroupJoinRequest;
-import com.studybuddies.server.web.dto.StudyGroupLeaveRequest;
-import com.studybuddies.server.web.dto.StudyGroupResponse;
+import com.studybuddies.server.web.dto.studygroup.StudyGroupJoinRequest;
+import com.studybuddies.server.web.dto.studygroup.StudyGroupLeaveRequest;
+import com.studybuddies.server.web.dto.studygroup.StudyGroupResponse;
 import com.studybuddies.server.web.mapper.StudyGroupMapper;
 import java.util.ArrayList;
 import lombok.AllArgsConstructor;
@@ -34,7 +34,7 @@ public List<StudyGroupResponse> get(String id) {
     var studyGroupEntities = findStudyGroupsByUUID(id);
     List<StudyGroupResponse> responses = new ArrayList<>();
     for (StudyGroupEntity studyGroupEntity : studyGroupEntities) {
-      responses.add(studyGroupMapper.studyGroupEntityToStudyGroupResponse(studyGroupEntity));
+      responses.add(studyGroupMapper.of(studyGroupEntity));
     }
     return responses;
   }

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

@@ -0,0 +1,8 @@
+package com.studybuddies.server.services.exceptions;
+
+public class InvalidModuleNameException extends StudyBuddiesException {
+  public InvalidModuleNameException(String m) {
+    super(m);
+  }
+}
+

server/src/main/java/com/studybuddies/server/services/StudyGroupService.java

@@ -0,0 +1,8 @@
+package com.studybuddies.server.services.exceptions;
+
+public class ModuleMayAlreadyExistException extends StudyBuddiesException {
+  public ModuleMayAlreadyExistException(String m) {
+    super(m);
+  }
+}
+