Merge pull request #101 from H-Hive/feature/notification

Feature/notification
H-Hive · Jan 26, 2024 · 01f6cfe · 01f6cfe
2 parents 9e932b7 + 24bd7d9
commit 01f6cfe
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 6 deletions.
diff --git a/src/main/java/com/HHive/hhive/domain/category/data/MajorCategory.java b/src/main/java/com/HHive/hhive/domain/category/data/MajorCategory.java
@@ -20,4 +20,10 @@ public String getTitle() {
     public static MajorCategory findByStringName(String categoryName) {
         return Arrays.stream(MajorCategory.values()).filter(majorCategory -> majorCategory.name().equals(categoryName)).findFirst().orElse(null);
     }
+    public static MajorCategory findByTitle(String title) {
+        return Arrays.stream(MajorCategory.values())
+                .filter(majorCategory -> majorCategory.title.equals(title))
+                .findFirst()
+                .orElse(null);
+    }
 }
diff --git a/src/main/java/com/HHive/hhive/domain/category/data/SubCategory.java b/src/main/java/com/HHive/hhive/domain/category/data/SubCategory.java
@@ -35,4 +35,10 @@ public String getTitle() {
     public static SubCategory findByStringName(String categoryName) {
         return Arrays.stream(SubCategory.values()).filter(subCategory -> subCategory.name().equals(categoryName)).findFirst().orElse(null);
     }
+    public static SubCategory findByTitle(String title) {
+        return Arrays.stream(SubCategory.values())
+                .filter(subCategory -> subCategory.title.equals(title))
+                .findFirst()
+                .orElse(null);
+    }
 }
diff --git a/src/main/java/com/HHive/hhive/domain/hive/controller/HiveController.java b/src/main/java/com/HHive/hhive/domain/hive/controller/HiveController.java
@@ -39,6 +39,8 @@ public class HiveController {
     public ResponseEntity<CommonResponse<HiveResponseDTO>> createHive(
             @AuthenticationPrincipal UserDetailsImpl userDetails,
             @RequestBody @Valid CreateHiveRequestDTO createHiveRequestDTO) {
+
+        SubCategory.findByStringName(createHiveRequestDTO.getSubCategoryName());
         HiveResponseDTO response = hiveService.createHive(userDetails.getUser(),
                 createHiveRequestDTO);
         return ResponseEntity.ok()

diff --git a/src/main/java/com/HHive/hhive/domain/hive/dto/CreateHiveRequestDTO.java b/src/main/java/com/HHive/hhive/domain/hive/dto/CreateHiveRequestDTO.java
@@ -19,11 +19,11 @@ public class CreateHiveRequestDTO {
     @NotBlank
     private String title;
 
-    private MajorCategory majorCategory;
+    private String majorCategoryName;
 
-    private SubCategory subCategory;
+    private String subCategoryName;
 
-    public Hive toEntity(User createdBy) {
+    public Hive toEntity(User createdBy,MajorCategory majorCategory,SubCategory subCategory) {
         return Hive.builder()
                 .title(title)
                 .majorCategory(majorCategory)

diff --git a/src/main/java/com/HHive/hhive/domain/hive/dto/HiveResponseDTO.java b/src/main/java/com/HHive/hhive/domain/hive/dto/HiveResponseDTO.java
@@ -48,8 +48,8 @@ public static HiveResponseDTO of(Hive hive) {
                 .majorCategory(majorName)
                 .subCategory(subName)
                 .introduction(hive.getIntroduction())
-                .hostId(hive.getId())
-                .hostName(hive.getUser().getEmail())
+                .hostId(hive.getCreatorId())
+                .hostName(hive.getUser().getUsername())
                 .createdAt(hive.getCreatedAt())
                 .modifiedAt(hive.getModifiedAt())
                 .build();

diff --git a/src/main/java/com/HHive/hhive/domain/hive/service/HiveService.java b/src/main/java/com/HHive/hhive/domain/hive/service/HiveService.java
@@ -40,7 +40,9 @@ public HiveResponseDTO createHive(User user, CreateHiveRequestDTO createHiveRequ
         if (hiveRepository.findByTitle(createHiveRequestDTO.getTitle()).isPresent()) {
             throw new AlreadyExistHiveException();
         }
-        Hive saveHive = hiveRepository.save(createHiveRequestDTO.toEntity(createBy));
+        Hive saveHive = hiveRepository.save(createHiveRequestDTO.toEntity(createBy
+                ,MajorCategory.findByTitle(createHiveRequestDTO.getMajorCategoryName())
+                ,SubCategory.findByTitle(createHiveRequestDTO.getSubCategoryName())));
         hiveUserService.saveHiveUser(saveHive, createBy);
 
         return HiveResponseDTO.of(saveHive);
@@ -51,6 +53,9 @@ public HiveResponseDTO createHive(User user, CreateHiveRequestDTO createHiveRequ
     public HiveResponseDTO updateHive(User user, Long hiveId,
             @Valid UpdateHiveRequestDTO updateHiveRequest) {
         Hive hive = getHiveAndCheckAuth(user, hiveId);
+        if (hiveRepository.findByTitle(updateHiveRequest.getTitle()).isPresent()) {
+            throw new AlreadyExistHiveException();
+        }
 
         hive.update(updateHiveRequest);
         return HiveResponseDTO.of(hive);