Merge pull request #149 from zanzanbari/feat/148

feat : Admin 계정에서 바로 왈소리 더미 데이터 추가하기 기능 #148
zanzanbari · Nov 18, 2023 · f285c3d · f285c3d
2 parents f457928 + ce322ed
commit f285c3d
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 20 deletions.
diff --git a/src/main/java/backend/wal/admin/adapter/RegisterItemManageAdapter.java b/src/main/java/backend/wal/admin/adapter/RegisterItemManageAdapter.java
@@ -2,14 +2,16 @@
 
 import backend.wal.admin.application.port.out.RegisterItemManagePort;
 import backend.wal.wal.censorWal.application.port.in.RetrieveCensorItemUseCase;
-import backend.wal.wal.censorWal.application.port.in.dto.ApprovedCensorItemResponseDto;
+import backend.wal.wal.censorWal.application.port.in.dto.ItemToRegisterDto;
 import backend.wal.wal.censorWal.application.port.in.dto.RetrieveCensorItemRequestDto;
 import backend.wal.wal.common.domain.WalCategoryType;
 import backend.wal.wal.item.application.port.in.CountItemUseCase;
 import backend.wal.wal.item.application.port.in.RegisterItemUseCase;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @Component
 public class RegisterItemManageAdapter implements RegisterItemManagePort {
@@ -28,11 +30,22 @@ public RegisterItemManageAdapter(final RetrieveCensorItemUseCase retrieveCensorI
 
     @Override
     public void registerItemsBy(WalCategoryType categoryType) {
-        List<ApprovedCensorItemResponseDto> approvedCensorItemInfo = retrieveCensorItemUseCase
+        List<ItemToRegisterDto> approvedCensorItemInfo = retrieveCensorItemUseCase
                 .retrieveApprovedCensorItemInfo(new RetrieveCensorItemRequestDto(categoryType));
         Long countOfCategoryType = countItemUseCase.countAllCorrespondItemsByCategoryType(categoryType);
         RegisterItemRequestDtoConvertor registerItemRequestDtoConvertor =
                 new RegisterItemRequestDtoConvertor(approvedCensorItemInfo, countOfCategoryType);
         registerItemUseCase.registerNewItems(registerItemRequestDtoConvertor.convert(), categoryType);
     }
+
+    @Override
+    public void registerAllItems(Set<String> contents, WalCategoryType categoryType) {
+        List<ItemToRegisterDto> itemToRegisterInfo = contents.stream()
+                .map(content -> new ItemToRegisterDto(categoryType, content, ""))
+                .collect(Collectors.toList());
+        Long countOfCategoryType = countItemUseCase.countAllCorrespondItemsByCategoryType(categoryType);
+        RegisterItemRequestDtoConvertor registerItemRequestDtoConvertor =
+                new RegisterItemRequestDtoConvertor(itemToRegisterInfo, countOfCategoryType);
+        registerItemUseCase.registerNewItems(registerItemRequestDtoConvertor.convert(), categoryType);
+    }
 }
diff --git a/src/main/java/backend/wal/admin/adapter/RegisterItemRequestDtoConvertor.java b/src/main/java/backend/wal/admin/adapter/RegisterItemRequestDtoConvertor.java
@@ -1,17 +1,17 @@
 package backend.wal.admin.adapter;
 
-import backend.wal.wal.censorWal.application.port.in.dto.ApprovedCensorItemResponseDto;
+import backend.wal.wal.censorWal.application.port.in.dto.ItemToRegisterDto;
 import backend.wal.wal.item.application.port.in.RegisterItemRequestDto;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class RegisterItemRequestDtoConvertor {
 
-    private final List<ApprovedCensorItemResponseDto> approvedCensorItemInfo;
+    private final List<ItemToRegisterDto> approvedCensorItemInfo;
     private final double countOfCategoryType;
 
-    public RegisterItemRequestDtoConvertor(List<ApprovedCensorItemResponseDto> approvedCensorItemInfo,
+    public RegisterItemRequestDtoConvertor(List<ItemToRegisterDto> approvedCensorItemInfo,
                                            double countOfCategoryType) {
         this.approvedCensorItemInfo = approvedCensorItemInfo;
         this.countOfCategoryType = countOfCategoryType;
@@ -21,7 +21,7 @@ public List<RegisterItemRequestDto> convert() {
         List<RegisterItemRequestDto> requestDtos = new ArrayList<>();
 
         double categoryItemNumber = calculateStartCategoryItemNumber();
-        for (ApprovedCensorItemResponseDto responseDto : approvedCensorItemInfo) {
+        for (ItemToRegisterDto responseDto : approvedCensorItemInfo) {
             RegisterItemRequestDto requestDto = new RegisterItemRequestDto(
                     responseDto.getContents(),
                     responseDto.getImageUrl(),

diff --git a/src/main/java/backend/wal/admin/application/port/out/RegisterItemManagePort.java b/src/main/java/backend/wal/admin/application/port/out/RegisterItemManagePort.java
@@ -2,6 +2,11 @@
 
 import backend.wal.wal.common.domain.WalCategoryType;
 
+import java.util.Set;
+
 public interface RegisterItemManagePort {
+
     void registerItemsBy(WalCategoryType categoryType);
+
+    void registerAllItems(Set<String> contents, WalCategoryType categoryType);
 }
diff --git a/src/main/java/backend/wal/admin/domain/aggregate/Admin.java b/src/main/java/backend/wal/admin/domain/aggregate/Admin.java
@@ -22,7 +22,7 @@ public class Admin {
     @Column(nullable = false, length = 50)
     private String email;
 
-    @Column(nullable = false, length = 50)
+    @Column(nullable = false, length = 500)
     private String password;
 
     @Enumerated(EnumType.STRING)

diff --git a/src/main/java/backend/wal/admin/web/AdminRegisterItemManageController.java b/src/main/java/backend/wal/admin/web/AdminRegisterItemManageController.java
@@ -1,6 +1,7 @@
 package backend.wal.admin.web;
 
 import backend.wal.admin.application.port.out.RegisterItemManagePort;
+import backend.wal.admin.web.dto.RegisterAllItemRequest;
 import backend.wal.admin.web.dto.RetrieveCensorItemRequest;
 import backend.wal.support.Role;
 import backend.wal.support.annotation.Authentication;
@@ -30,4 +31,11 @@ public ResponseEntity<Void> register(@Valid @RequestBody RetrieveCensorItemReque
         registerItemManagePort.registerItemsBy(request.getCategoryType());
         return ResponseEntity.status(HttpStatus.CREATED).build();
     }
+
+    @Authentication(Role.ADMIN)
+    @PostMapping("/register/all")
+    public ResponseEntity<Void> registerAll(@Valid @RequestBody RegisterAllItemRequest request) {
+        registerItemManagePort.registerAllItems(request.getContents(), request.getCategoryType());
+        return ResponseEntity.status(HttpStatus.CREATED).build();
+    }
 }
diff --git a/src/main/java/backend/wal/admin/web/dto/RegisterAllItemRequest.java b/src/main/java/backend/wal/admin/web/dto/RegisterAllItemRequest.java
@@ -0,0 +1,28 @@
+package backend.wal.admin.web.dto;
+
+import backend.wal.wal.common.domain.WalCategoryType;
+
+import javax.validation.constraints.NotNull;
+import java.util.Set;
+
+public class RegisterAllItemRequest {
+
+    @NotNull
+    private Set<String> contents;
+
+    @NotNull
+    private WalCategoryType categoryType;
+
+    public RegisterAllItemRequest(Set<String> contents, WalCategoryType categoryType) {
+        this.contents = contents;
+        this.categoryType = categoryType;
+    }
+
+    public Set<String> getContents() {
+        return contents;
+    }
+
+    public WalCategoryType getCategoryType() {
+        return categoryType;
+    }
+}
diff --git a/src/main/java/backend/wal/wal/censorWal/application/port/in/RetrieveCensorItemUseCase.java b/src/main/java/backend/wal/wal/censorWal/application/port/in/RetrieveCensorItemUseCase.java
@@ -1,6 +1,6 @@
 package backend.wal.wal.censorWal.application.port.in;
 
-import backend.wal.wal.censorWal.application.port.in.dto.ApprovedCensorItemResponseDto;
+import backend.wal.wal.censorWal.application.port.in.dto.ItemToRegisterDto;
 import backend.wal.wal.censorWal.application.port.in.dto.RetrieveCensorItemRequestDto;
 import backend.wal.wal.censorWal.application.port.in.dto.UncheckedCensorItemResponseDto;
 
@@ -10,5 +10,5 @@ public interface RetrieveCensorItemUseCase {
 
     List<UncheckedCensorItemResponseDto> retrieveUncheckedCensorItemInfo(RetrieveCensorItemRequestDto requestDto);
 
-    List<ApprovedCensorItemResponseDto> retrieveApprovedCensorItemInfo(RetrieveCensorItemRequestDto requestDto);
+    List<ItemToRegisterDto> retrieveApprovedCensorItemInfo(RetrieveCensorItemRequestDto requestDto);
 }
diff --git a/...in/dto/ApprovedCensorItemResponseDto.java → ...cation/port/in/dto/ItemToRegisterDto.java b/...in/dto/ApprovedCensorItemResponseDto.java → ...cation/port/in/dto/ItemToRegisterDto.java
@@ -2,13 +2,13 @@
 
 import backend.wal.wal.common.domain.WalCategoryType;
 
-public class ApprovedCensorItemResponseDto {
+public class ItemToRegisterDto {
 
     private final WalCategoryType categoryType;
     private final String contents;
     private final String imageUrl;
 
-    public ApprovedCensorItemResponseDto(WalCategoryType categoryType, String contents, String imageUrl) {
+    public ItemToRegisterDto(WalCategoryType categoryType, String contents, String imageUrl) {
         this.categoryType = categoryType;
         this.contents = contents;
         this.imageUrl = imageUrl;

diff --git a/src/main/java/backend/wal/wal/censorWal/application/service/RetrieveCensorItemService.java b/src/main/java/backend/wal/wal/censorWal/application/service/RetrieveCensorItemService.java
@@ -2,7 +2,7 @@
 
 import backend.wal.support.annotation.AppService;
 import backend.wal.wal.censorWal.application.port.in.RetrieveCensorItemUseCase;
-import backend.wal.wal.censorWal.application.port.in.dto.ApprovedCensorItemResponseDto;
+import backend.wal.wal.censorWal.application.port.in.dto.ItemToRegisterDto;
 import backend.wal.wal.censorWal.application.port.in.dto.RetrieveCensorItemRequestDto;
 import backend.wal.wal.censorWal.application.port.in.dto.UncheckedCensorItemResponseDto;
 import backend.wal.wal.censorWal.domain.repository.CensorItemRepository;
@@ -39,12 +39,12 @@ public List<UncheckedCensorItemResponseDto> retrieveUncheckedCensorItemInfo(
     }
 
     @Override
-    public List<ApprovedCensorItemResponseDto> retrieveApprovedCensorItemInfo(
+    public List<ItemToRegisterDto> retrieveApprovedCensorItemInfo(
             RetrieveCensorItemRequestDto requestDto) {
         return censorItemRepository
                 .findAllByCategoryTypeAndCheckStatus(requestDto.getCategoryType(), APPROVED)
                 .stream()
-                .map(censorItem -> new ApprovedCensorItemResponseDto(
+                .map(censorItem -> new ItemToRegisterDto(
                         censorItem.getCategoryType(),
                         censorItem.getContents(),
                         censorItem.getImageUrl())

diff --git a/src/test/java/backend/wal/admin/adapter/RegisterItemRequestDtoConvertorTest.java b/src/test/java/backend/wal/admin/adapter/RegisterItemRequestDtoConvertorTest.java
@@ -1,6 +1,6 @@
 package backend.wal.admin.adapter;
 
-import backend.wal.wal.censorWal.application.port.in.dto.ApprovedCensorItemResponseDto;
+import backend.wal.wal.censorWal.application.port.in.dto.ItemToRegisterDto;
 import backend.wal.wal.item.application.port.in.RegisterItemRequestDto;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -22,10 +22,10 @@ class RegisterItemRequestDtoConvertorTest {
     @Test
     void convert() {
         // given
-        List<ApprovedCensorItemResponseDto> approvedCensorItemsInfo = List.of(
-                new ApprovedCensorItemResponseDto(COMEDY, "드립1", ""),
-                new ApprovedCensorItemResponseDto(COMEDY, "드립2", ""),
-                new ApprovedCensorItemResponseDto(COMEDY, "드립3", "")
+        List<ItemToRegisterDto> approvedCensorItemsInfo = List.of(
+                new ItemToRegisterDto(COMEDY, "드립1", ""),
+                new ItemToRegisterDto(COMEDY, "드립2", ""),
+                new ItemToRegisterDto(COMEDY, "드립3", "")
         );
         RegisterItemRequestDtoConvertor convertor =
                 new RegisterItemRequestDtoConvertor(approvedCensorItemsInfo, COUNT_OF_CATEGORY_TYPE);
@@ -45,7 +45,7 @@ void convert() {
                 .collect(Collectors.toUnmodifiableList());
 
         List<String> expectContents = approvedCensorItemsInfo.stream()
-                .map(ApprovedCensorItemResponseDto::getContents)
+                .map(ItemToRegisterDto::getContents)
                 .collect(Collectors.toUnmodifiableList());
         List<String> actualContents = registerItemRequestInfo.stream()
                 .map(RegisterItemRequestDto::getContents)