ADD :: 리뷰 반영 (#63)

soolung · Mar 31, 2023 · 2fa52fc · 2fa52fc
1 parent d4e5ab5
commit 2fa52fc
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 40 deletions.
diff --git a/src/main/java/com/soogung/simblue/domain/group/domain/repository/GroupRepository.java b/src/main/java/com/soogung/simblue/domain/group/domain/repository/GroupRepository.java
@@ -8,6 +8,5 @@
 
 public interface GroupRepository extends CrudRepository<Group, Long> {
 
-    Optional<Group> findByGroupName(String name);
     List<Group> findAll();
 }
diff --git a/src/main/java/com/soogung/simblue/domain/group/presentation/MemberController.java b/src/main/java/com/soogung/simblue/domain/group/presentation/MemberController.java
@@ -1,7 +1,7 @@
 package com.soogung.simblue.domain.group.presentation;
 
-import com.soogung.simblue.domain.group.presentation.dto.request.JoinGroupRequest;
-import com.soogung.simblue.domain.group.service.JoinGroupService;
+import com.soogung.simblue.domain.group.presentation.dto.request.AddGroupRequest;
+import com.soogung.simblue.domain.group.service.AddGroupService;
 import com.soogung.simblue.domain.group.presentation.dto.request.GroupRequest;
 import com.soogung.simblue.domain.group.presentation.dto.response.GroupListResponse;
 import com.soogung.simblue.domain.group.service.CreateGroupService;
@@ -10,7 +10,6 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
-import java.util.List;
 
 @RestController
 @RequestMapping("/group")
@@ -19,9 +18,8 @@ public class MemberController {
 
     private final CreateGroupService createGroupService;
     private final QueryGroupService queryGroupService;
-    private final JoinGroupService joinGroupService;
+    private final AddGroupService addGroupService;
 
-<<<<<<< HEAD:src/main/java/com/soogung/simblue/domain/group/presentation/GroupController.java
     @PostMapping
     public void createGroup(@RequestBody @Valid GroupRequest request) {
         createGroupService.execute(request);
@@ -31,12 +29,9 @@ public void createGroup(@RequestBody @Valid GroupRequest request) {
     public GroupListResponse getGroupList(){
         return queryGroupService.execute();
     }
-    
+
     @PutMapping("/{id}/add")
-=======
-    @PostMapping("/{id}/join")
->>>>>>> 4e6690e (ADD :: 리뷰 반영 (#63)):src/main/java/com/soogung/simblue/domain/group/presentation/MemberController.java
-    public void addMember(@PathVariable Long id,@RequestBody @Valid JoinGroupRequest request) {
-        joinGroupService.execute(id, request);
+    public void addMember(@PathVariable Long id,@RequestBody @Valid AddGroupRequest request) {
+        addGroupService.execute(id, request);
     }
 }
diff --git a/src/main/java/com/soogung/simblue/domain/group/presentation/dto/request/AddGroupRequest.java b/src/main/java/com/soogung/simblue/domain/group/presentation/dto/request/AddGroupRequest.java
@@ -0,0 +1,13 @@
+package com.soogung.simblue.domain.group.presentation.dto.request;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@NoArgsConstructor
+public class AddGroupRequest {
+
+    private List<MemberRequest> memberList;
+}
diff --git a/...main/java/com/soogung/simblue/domain/group/presentation/dto/request/JoinGroupRequest.java b/...main/java/com/soogung/simblue/domain/group/presentation/dto/request/JoinGroupRequest.java
diff --git a/...omain/group/service/JoinGroupService.java → ...domain/group/service/AddGroupService.java b/...omain/group/service/JoinGroupService.java → ...domain/group/service/AddGroupService.java
@@ -4,28 +4,26 @@
 import com.soogung.simblue.domain.group.domain.Member;
 import com.soogung.simblue.domain.group.domain.repository.GroupRepository;
 import com.soogung.simblue.domain.group.domain.repository.MemberRepository;
-import com.soogung.simblue.domain.group.exception.GroupNotFoundException;
 import com.soogung.simblue.domain.group.facade.GroupFacade;
-import com.soogung.simblue.domain.group.presentation.dto.request.JoinGroupRequest;
-import com.soogung.simblue.domain.group.presentation.dto.request.MemberRequest;
-import com.soogung.simblue.domain.user.domain.Student;
+import com.soogung.simblue.domain.group.presentation.dto.request.AddGroupRequest;
 import com.soogung.simblue.domain.user.facade.UserFacade;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import javax.transaction.Transactional;
 import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
-public class JoinGroupService {
+public class AddGroupService {
 
     private final GroupRepository groupRepository;
     private final MemberRepository memberRepository;
     private final UserFacade userFacade;
     private final GroupFacade groupFacade;
 
-
-    public void execute(Long id,JoinGroupRequest request) {
+    @Transactional
+    public void execute(Long id, AddGroupRequest request) {
 
         Group group = groupFacade.findGroup(id);
 

diff --git a/src/main/java/com/soogung/simblue/global/security/SecurityConfig.java b/src/main/java/com/soogung/simblue/global/security/SecurityConfig.java
@@ -60,6 +60,7 @@ public SecurityFilterChain configure(HttpSecurity http) throws Exception {
                 .antMatchers(HttpMethod.GET, "/application/{\\d+}/form").hasRole(Authority.ROLE_TEACHER.getRole())
                 .antMatchers(HttpMethod.GET, "/application/{\\d+}/result").hasRole(Authority.ROLE_TEACHER.getRole())
                 .antMatchers(HttpMethod.POST, "/application").hasRole(Authority.ROLE_TEACHER.getRole())
+                .antMatchers(HttpMethod.POST, "group/{\\d+}/add").hasRole(Authority.ROLE_TEACHER.getRole())
                 .antMatchers(HttpMethod.GET, "/application/**").permitAll()
                 .antMatchers(HttpMethod.GET, "/banner").permitAll()
                 .anyRequest().authenticated()