diff --git a/src/main/java/io/company/localhost/controller/api/ProjectController.java b/src/main/java/io/company/localhost/controller/api/ProjectController.java index f1094ad..229da38 100644 --- a/src/main/java/io/company/localhost/controller/api/ProjectController.java +++ b/src/main/java/io/company/localhost/controller/api/ProjectController.java @@ -31,6 +31,7 @@ import io.company.localhost.common.annotation.ReqMap; import io.company.localhost.common.dto.ApiResponse; import io.company.localhost.common.dto.MapDto; import io.company.localhost.service.NetprojctService; +import io.company.localhost.service.ProMemberService; import io.company.localhost.service.commoncodService; import io.company.localhost.utils.AuthUtil; import io.company.localhost.vo.MemberVo; @@ -45,6 +46,7 @@ public class ProjectController { private final commoncodService commoncodservice; private final NetprojctService netprojctService; + private final ProMemberService promemberService; /** * 프로젝트 연도 조회 @@ -64,7 +66,7 @@ public class ProjectController { * * @param projectName 프로젝트 이름 * @param participantSeq 참여자 번호 - * @param address 주소 정보 (주소, 상세주소, 우편번호 + * @param address 주소 정보 (주소, 상세주소, 우편번호) * @return * */ @@ -114,7 +116,7 @@ public class ProjectController { */ @PatchMapping("/updateYon") public ApiResponse updateProjectMember(@ReqMap MapDto map) { - boolean isMember = netprojctService.updateProjectMember(map); + boolean isMember = promemberService.updateProjectMember(map); return ApiResponse.ok(isMember); } @@ -128,7 +130,7 @@ public class ProjectController { @GetMapping("/members/{projctSeq}") public ApiResponse> selectProjectMembers(@PathVariable int projctSeq) { - return ApiResponse.ok(netprojctService.getProjectMembers(projctSeq)); + return ApiResponse.ok(promemberService.selectProjectMembers(projctSeq)); } /** diff --git a/src/main/java/io/company/localhost/mapper/NetprojctMapper.java b/src/main/java/io/company/localhost/mapper/NetprojctMapper.java index 78d34b5..0ae863b 100644 --- a/src/main/java/io/company/localhost/mapper/NetprojctMapper.java +++ b/src/main/java/io/company/localhost/mapper/NetprojctMapper.java @@ -29,11 +29,5 @@ public interface NetprojctMapper { int updateProject(MapDto map); - int insertProjectMember(Integer projctSeq); - - int updateProjectMember(MapDto map); - - List selectProjectMembers(int projctSeq); - List selectProjectLog(int projctSeq); } diff --git a/src/main/java/io/company/localhost/mapper/PromemberMapper.java b/src/main/java/io/company/localhost/mapper/PromemberMapper.java new file mode 100644 index 0000000..ae6bbb1 --- /dev/null +++ b/src/main/java/io/company/localhost/mapper/PromemberMapper.java @@ -0,0 +1,34 @@ +/************************************************************ + * + * @packageName : io.company.localhost.mapper + * @fileName : PromemberMapper.java + * @author : 박지윤 + * @date : 24.02.20 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 24.02.20 박지윤 최초 생성 + * + *************************************************************/ +package io.company.localhost.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; + +import io.company.localhost.common.dto.MapDto; + +@Mapper +public interface PromemberMapper { + + int insertProjectMember(Integer projctSeq); + + int insertNewMemberToProjects(Integer memberSeq); + + int updateProjectMember(MapDto map); + + List selectProjectMembers(int projctSeq); + +} diff --git a/src/main/java/io/company/localhost/service/NetmemberService.java b/src/main/java/io/company/localhost/service/NetmemberService.java index 6be86c2..6b79f1e 100644 --- a/src/main/java/io/company/localhost/service/NetmemberService.java +++ b/src/main/java/io/company/localhost/service/NetmemberService.java @@ -23,6 +23,7 @@ import org.springframework.web.multipart.MultipartFile; import io.company.localhost.common.dto.MapDto; import io.company.localhost.mapper.NetmemberMapper; +import io.company.localhost.mapper.PromemberMapper; import io.company.localhost.mapper.commoncodMapper; import lombok.RequiredArgsConstructor; @@ -31,6 +32,7 @@ import lombok.RequiredArgsConstructor; public class NetmemberService { private final NetmemberMapper memberMapper; private final commoncodMapper commoncodMapper; + private final PromemberMapper promemberMapper; private final DelegatingPasswordEncoder passwordEncoder; private final FileService fileService; @@ -62,7 +64,7 @@ public class NetmemberService { // 회원 정보 저장 int result = memberMapper.insertMember(map); - + // 선택한 색상 코드 사용 처리 String color = map.getString("memberCol"); @@ -72,6 +74,10 @@ public class NetmemberService { colorMap.put("type", "YON"); commoncodMapper.updateColorYon(colorMap); + + // 모든 프로젝트에 새로운 멤버 추가 + Integer newMemberSeq = map.getInt("MEMBERSEQ"); + promemberMapper.insertNewMemberToProjects(newMemberSeq); return result; } diff --git a/src/main/java/io/company/localhost/service/NetprojctService.java b/src/main/java/io/company/localhost/service/NetprojctService.java index 72d01f5..0614f11 100644 --- a/src/main/java/io/company/localhost/service/NetprojctService.java +++ b/src/main/java/io/company/localhost/service/NetprojctService.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import io.company.localhost.common.dto.MapDto; import io.company.localhost.mapper.NetprojctMapper; +import io.company.localhost.mapper.PromemberMapper; import io.company.localhost.mapper.commoncodMapper; import lombok.RequiredArgsConstructor; @@ -30,6 +31,7 @@ import lombok.RequiredArgsConstructor; public class NetprojctService { private final commoncodMapper commoncodMapper; private final NetprojctMapper netprojctMapper; + private final PromemberMapper promemberMapper; /** @@ -63,7 +65,7 @@ public class NetprojctService { Integer projctSeq = map.getInt("PROJCTSEQ"); - netprojctMapper.insertProjectMember(projctSeq); + promemberMapper.insertProjectMember(projctSeq); return result; } @@ -101,26 +103,7 @@ public class NetprojctService { return result; } - /** - * 프로젝트 참여, 미참여 member - * - * @param map - * @return - */ - public boolean updateProjectMember(MapDto map) { - return netprojctMapper.updateProjectMember(map) > 0; - } - - /** - * 프로젝트 멤버리스트 조회 - * - * @param - * @return - */ - public List getProjectMembers(int projctSeq) { - return netprojctMapper.selectProjectMembers(projctSeq); - } - + /** * 프로젝트 log 조회 * diff --git a/src/main/java/io/company/localhost/service/ProMemberService.java b/src/main/java/io/company/localhost/service/ProMemberService.java new file mode 100644 index 0000000..cde686b --- /dev/null +++ b/src/main/java/io/company/localhost/service/ProMemberService.java @@ -0,0 +1,53 @@ +/************************************************************ + * + * @packageName : io.company.localhost.PromemberService + * @fileName : PromemberService.java + * @author : 박지윤 + * @date : 25.02.20 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 25.02.20 박지윤 최초 생성 + * + *************************************************************/ +package io.company.localhost.service; + +import java.util.List; + +import org.springframework.stereotype.Service; + +import io.company.localhost.common.dto.MapDto; +import io.company.localhost.mapper.PromemberMapper; +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class ProMemberService { + private final PromemberMapper promemberMapper; + + /** + * 프로젝트 참여, 미참여 member + * + * @param map + * @return + */ + public boolean updateProjectMember(MapDto map) { + return promemberMapper.updateProjectMember(map) > 0; + } + + + /** + * 프로젝트 멤버리스트 조회 + * + * @param + * @return + */ + public List selectProjectMembers(int projctSeq) { + return promemberMapper.selectProjectMembers(projctSeq); + } + + + +} diff --git a/src/main/resources/mapper/netmemberMapper.xml b/src/main/resources/mapper/NetmemberMapper.xml similarity index 100% rename from src/main/resources/mapper/netmemberMapper.xml rename to src/main/resources/mapper/NetmemberMapper.xml diff --git a/src/main/resources/mapper/netprojctMapper.xml b/src/main/resources/mapper/NetprojctMapper.xml similarity index 76% rename from src/main/resources/mapper/netprojctMapper.xml rename to src/main/resources/mapper/NetprojctMapper.xml index 05762c8..a20e6c7 100644 --- a/src/main/resources/mapper/netprojctMapper.xml +++ b/src/main/resources/mapper/NetprojctMapper.xml @@ -77,35 +77,7 @@ PROJCTUMB = #{projctUmb} WHERE PROJCTSEQ = #{projctSeq} - - - - - INSERT INTO promember (PROJCTSEQ, MEMBERSEQ, PROJCTYON) - SELECT #{projctSeq}, MEMBERSEQ, '1' FROM netmember; - - - - - UPDATE promember - SET PROJCTYON = #{projctYon} - WHERE PROJCTSEQ = #{projctSeq} - AND MEMBERSEQ = #{memberSeq} - - - - - + + SELECT pm.PROJCTSEQ, + pm.MEMBERSEQ, + pm.PROJCTYON, + nm.MEMBERNAM, + nm.MEMBERPRF, + nm.MEMBERCOL as usercolor + FROM promember pm + JOIN netmember nm ON pm.MEMBERSEQ = nm.MEMBERSEQ + WHERE pm.PROJCTSEQ = #{projctSeq} + + +