[deploy] 클라이언트 요구사항 반영 후 배포 진행합니다.

src/main/java/com/ggang/be/api/group/controller/GroupController.java

@@ -149,4 +149,15 @@ public ResponseEntity<ApiResponse<Void>> cancelMyApplication(
 
         return ResponseBuilder.ok(null);
     }
+
+    @DeleteMapping("/my/groups")
+    public ResponseEntity<ApiResponse<Void>> deleteMyGroup(
+            @RequestHeader("Authorization") String accessToken,
+            @RequestBody final GroupRequest requestDto
+    ) {
+        Long userId = jwtService.parseTokenAndGetUserId(accessToken);
+        groupFacade.deleteMyGroup(userId, requestDto);
+
+        return ResponseBuilder.ok(null);
+    }
 }

src/main/java/com/ggang/be/api/group/everyGroup/service/EveryGroupService.java

@@ -24,7 +24,9 @@ public interface EveryGroupService {
     ReadCommentGroup readCommentInGroup(UserEntity userEntity, boolean commentEntity, final long groupId);
 
     EveryGroupEntity registerEveryGroup(RegisterGroupServiceRequest serviceRequest,
-                            GongbaekTimeSlotEntity gongbaekTimeSlotEntity);
+                                        GongbaekTimeSlotEntity gongbaekTimeSlotEntity);
+
+    void deleteEveryGroup(UserEntity currentUser, EveryGroupEntity everyGroupEntity);
 
     ReadEveryGroup getActiveEveryGroups(UserEntity currentUser, Category category);
 

src/main/java/com/ggang/be/api/group/everyGroup/strategy/DeleteEveryGroupStrategy.java

@@ -0,0 +1,27 @@
+package com.ggang.be.api.group.everyGroup.strategy;
+
+import com.ggang.be.api.group.dto.GroupRequest;
+import com.ggang.be.api.group.everyGroup.service.EveryGroupService;
+import com.ggang.be.api.group.registry.DeleteGroupStrategy;
+import com.ggang.be.domain.constant.GroupType;
+import com.ggang.be.domain.group.everyGroup.EveryGroupEntity;
+import com.ggang.be.domain.user.UserEntity;
+import com.ggang.be.global.annotation.Strategy;
+import lombok.RequiredArgsConstructor;
+
+@Strategy
+@RequiredArgsConstructor
+public class DeleteEveryGroupStrategy implements DeleteGroupStrategy {
+    private final EveryGroupService everyGroupService;
+
+    @Override
+    public boolean support(GroupType groupType) {
+        return groupType.equals(GroupType.WEEKLY);
+    }
+
+    @Override
+    public void deleteGroup(UserEntity userEntity, GroupRequest request) {
+        EveryGroupEntity everyGroupEntity = everyGroupService.findEveryGroupEntityByGroupId(request.groupId());
+        everyGroupService.deleteEveryGroup(userEntity, everyGroupEntity);
+    }
+}

src/main/java/com/ggang/be/api/group/facade/GroupFacade.java

@@ -38,6 +38,7 @@ public class GroupFacade {
     private final RegisterGroupStrategyRegistry registerGroupStrategyRegistry;
     private final PrepareRegisterGongbaekFacade prepareRegisterGongbaekFacade;
     private final CancelGroupStrategyRegistry cancelGroupStrategyRegistry;
+    private final DeleteGroupStrategyRegistry deleteGroupStrategyRegistry;
     private final GroupUserInfoStrategyRegistry groupUserInfoStrategyRegistry;
     private final ActiveCombinedGroupVoPreparer activeCombinedGroupVoPreparer;
     private final MyGroupStrategyRegistry myGroupStrategyRegistry;
@@ -107,6 +108,17 @@ public void cancelMyApplication(Long userId, GroupRequest requestDto) {
         cancelGroupStrategy.cancelGroup(findUserEntity, requestDto);
     }
 
+    @Transactional
+    public void deleteMyGroup(Long userId, GroupRequest requestDto) {
+        UserEntity findUserEntity = userService.getUserById(userId);
+
+        DeleteGroupStrategy deleteGroupStrategy = deleteGroupStrategyRegistry.getDeleteGroupStrategy(
+                requestDto.groupType()
+        );
+
+        deleteGroupStrategy.deleteGroup(findUserEntity, requestDto);
+    }
+
     public List<MyGroupResponse> getMyGroups(long userId, FillGroupType category, boolean status) {
         UserEntity currentUser = userService.getUserById(userId);
 

src/main/java/com/ggang/be/api/group/onceGroup/service/OnceGroupService.java

@@ -26,6 +26,8 @@ public interface OnceGroupService {
     OnceGroupEntity registerOnceGroup(RegisterGroupServiceRequest serviceRequest,
                            GongbaekTimeSlotEntity gongbaekTimeSlotEntity);
 
+    void deleteOnceGroup(UserEntity currentUser, OnceGroupEntity onceGroupEntity);
+
     ReadOnceGroup getActiveOnceGroups(UserEntity currentUser, Category category);
 
     void validateApplyOnceGroup(UserEntity currentUser, OnceGroupEntity onceGroupEntity);

src/main/java/com/ggang/be/api/group/onceGroup/strategy/DeleteOnceGroupStrategy.java

@@ -0,0 +1,27 @@
+package com.ggang.be.api.group.onceGroup.strategy;
+
+import com.ggang.be.api.group.dto.GroupRequest;
+import com.ggang.be.api.group.onceGroup.service.OnceGroupService;
+import com.ggang.be.api.group.registry.DeleteGroupStrategy;
+import com.ggang.be.domain.constant.GroupType;
+import com.ggang.be.domain.group.onceGroup.OnceGroupEntity;
+import com.ggang.be.domain.user.UserEntity;
+import com.ggang.be.global.annotation.Strategy;
+import lombok.RequiredArgsConstructor;
+
+@Strategy
+@RequiredArgsConstructor
+public class DeleteOnceGroupStrategy implements DeleteGroupStrategy {
+    private final OnceGroupService onceGroupService;
+
+    @Override
+    public boolean support(GroupType groupType) {
+        return groupType.equals(GroupType.ONCE);
+    }
+
+    @Override
+    public void deleteGroup(UserEntity userEntity, GroupRequest request) {
+        OnceGroupEntity onceGroupEntity = onceGroupService.findOnceGroupEntityByGroupId(request.groupId());
+        onceGroupService.deleteOnceGroup(userEntity, onceGroupEntity);
+    }
+}

src/main/java/com/ggang/be/api/group/registry/DeleteGroupStrategy.java

@@ -0,0 +1,11 @@
+package com.ggang.be.api.group.registry;
+
+import com.ggang.be.api.group.dto.GroupRequest;
+import com.ggang.be.domain.constant.GroupType;
+import com.ggang.be.domain.user.UserEntity;
+
+public interface DeleteGroupStrategy {
+    boolean support(GroupType groupType);
+
+    void deleteGroup(UserEntity userEntity, GroupRequest request);
+}

src/main/java/com/ggang/be/api/group/registry/DeleteGroupStrategyRegistry.java

@@ -0,0 +1,22 @@
+package com.ggang.be.api.group.registry;
+
+import com.ggang.be.api.common.ResponseError;
+import com.ggang.be.api.exception.GongBaekException;
+import com.ggang.be.domain.constant.GroupType;
+import com.ggang.be.global.annotation.Registry;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+
+@Registry
+@RequiredArgsConstructor
+public class DeleteGroupStrategyRegistry {
+    private final List<DeleteGroupStrategy> deleteGroupStrategies;
+
+    public DeleteGroupStrategy getDeleteGroupStrategy(GroupType groupType) {
+        return deleteGroupStrategies.stream()
+                .filter(applyGroupStrategy -> applyGroupStrategy.support(groupType))
+                .findFirst()
+                .orElseThrow(() -> new GongBaekException(ResponseError.BAD_REQUEST));
+    }
+}

src/main/java/com/ggang/be/domain/group/LocationValidator.java

@@ -12,7 +12,7 @@
 @Slf4j
 public class LocationValidator {
 
-    private static final Pattern pattern = Pattern.compile("^[가-힣a-zA-Z\s]+$");
+    private static final Pattern pattern = Pattern.compile("^[가-힣a-zA-Z\s0-9]+$");
 
     public void isLocationValid(final String value){
         log.info("now Location value is : {}", value);

src/main/java/com/ggang/be/domain/group/everyGroup/application/EveryGroupServiceImpl.java

@@ -19,14 +19,14 @@
 import com.ggang.be.domain.group.vo.ReadCommentGroup;
 import com.ggang.be.domain.timslot.gongbaekTimeSlot.GongbaekTimeSlotEntity;
 import com.ggang.be.domain.user.UserEntity;
-import java.time.LocalDate;
-import java.time.Month;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
+import java.time.Month;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -143,6 +143,13 @@ public EveryGroupEntity registerEveryGroup(RegisterGroupServiceRequest serviceRe
         return everyGroupRepository.save(buildEntity);
     }
 
+    @Override
+    @Transactional
+    public void deleteEveryGroup(UserEntity currentUser, EveryGroupEntity everyGroupEntity) {
+        validateDeleteEveryGroup(currentUser, everyGroupEntity);
+        everyGroupRepository.delete(everyGroupEntity);
+    }
+
     @Override
     @Transactional
     public void validateApplyEveryGroup(UserEntity currentUser, EveryGroupEntity everyGroupEntity) {
@@ -166,6 +173,10 @@ public void updateStatus() {
         everyGroupEntities.forEach(groupStatusUpdater::updateEveryGroup);
     }
 
+    private void validateDeleteEveryGroup(UserEntity currentUser, EveryGroupEntity everyGroupEntity) {
+        if (!everyGroupEntity.isHost(currentUser))
+            throw new GongBaekException(ResponseError.UNAUTHORIZED_ACCESS);
+    }
 
     private EveryGroupEntity buildEveryGroupEntity(RegisterGroupServiceRequest serviceRequest,
         GongbaekTimeSlotEntity gongbaekTimeSlotEntity) {
@@ -175,7 +186,7 @@ private EveryGroupEntity buildEveryGroupEntity(RegisterGroupServiceRequest servi
 
         return EveryGroupEntity.builder()
             .category(serviceRequest.category())
-            .dueDate(dueDateExtracter(month, nowDate))
+            .dueDate(dueDateExtractor(month, nowDate))
             .coverImg(serviceRequest.coverImg())
             .location(serviceRequest.location())
             .status(Status.RECRUITING)
@@ -187,7 +198,7 @@ private EveryGroupEntity buildEveryGroupEntity(RegisterGroupServiceRequest servi
             .build();
     }
 
-    private LocalDate dueDateExtracter(int month, LocalDate nowDate) {
+    private LocalDate dueDateExtractor(int month, LocalDate nowDate) {
         if(month < 7)
             return  LocalDate.of(nowDate.getYear(), Month.JUNE, 30);
         return LocalDate.of(nowDate.getYear(), Month.DECEMBER, 31);

src/main/java/com/ggang/be/domain/group/onceGroup/application/OnceGroupServiceImpl.java

@@ -130,6 +130,13 @@ public OnceGroupEntity registerOnceGroup(RegisterGroupServiceRequest serviceRequ
         return onceGroupRepository.save(buildEntity);
     }
 
+    @Override
+    @Transactional
+    public void deleteOnceGroup(UserEntity currentUser, OnceGroupEntity onceGroupEntity) {
+        validateDeleteOnceGroup(currentUser, onceGroupEntity);
+        onceGroupRepository.delete(onceGroupEntity);
+    }
+
     @Override
     @Transactional
     public void validateApplyOnceGroup(UserEntity currentUser, OnceGroupEntity onceGroupEntity){
@@ -155,6 +162,11 @@ public void updateStatus() {
             .forEach(groupStatusUpdater::updateOnceGroup);
     }
 
+    private void validateDeleteOnceGroup(UserEntity currentUser, OnceGroupEntity onceGroupEntity) {
+        if (!onceGroupEntity.isHost(currentUser))
+            throw new GongBaekException(ResponseError.UNAUTHORIZED_ACCESS);
+    }
+
     private OnceGroupEntity buildOnceGroupEntity(RegisterGroupServiceRequest serviceRequest,
         GongbaekTimeSlotEntity gongbaekTimeSlotEntity) {
         return OnceGroupEntity.builder()