로그 저장 추가, 어드민 회원 관련 API 수정

src/main/java/com/hyundai/domain/admin/controller/AdminMemberController.java

@@ -1,7 +1,7 @@
 package com.hyundai.domain.admin.controller;
 
+import com.hyundai.domain.admin.dto.AdminManagerDTO;
 import com.hyundai.domain.admin.dto.AdminMemberDTO;
-import com.hyundai.domain.admin.dto.AdminMemberParamDTO;
 import com.hyundai.domain.admin.service.AdminMemberService;
 import com.hyundai.global.message.ResponseMessage;
 import lombok.RequiredArgsConstructor;
@@ -19,43 +19,35 @@
 public class AdminMemberController {
     private final AdminMemberService adminMemberService;
 
-    @PostMapping("/member")
-    public ResponseEntity getMembers(@RequestBody AdminMemberParamDTO paramDTO){
-        return ResponseMessage.SuccessResponse("회원 조회 성공", adminMemberService.getMemberList(paramDTO));
+    @GetMapping("/member")
+    public ResponseEntity getMembers(){
+        return ResponseMessage.SuccessResponse("회원 조회 성공", adminMemberService.getMemberList());
     }
-
-    @PostMapping("/member/{pageNum}")
-    public ResponseEntity getMembersByPage(@RequestBody AdminMemberParamDTO paramDTO, @PathVariable("pageNum") Long pageNum){
-        return ResponseMessage.
-                SuccessResponse(pageNum + "페이지 조회 성공", adminMemberService.getMemberListByPage(paramDTO, pageNum));
+    @GetMapping("/member/manager")
+    public ResponseEntity getManagers(){
+        return ResponseMessage.SuccessResponse("매니저 조회 성공", adminMemberService.getManagerList());
     }
     @PostMapping("/member/modify")
     public ResponseEntity modifyMember(@RequestBody AdminMemberDTO memberDTO){
         return ResponseMessage
-                .SuccessResponse(memberDTO.getMemberId() + "회원 수정 성공", adminMemberService.modifyMember(memberDTO));
+                .SuccessResponse(memberDTO.getMemberName() + "회원 수정 성공", adminMemberService.modifyMember(memberDTO));
     }
-
     @DeleteMapping("/member/delete")
     public ResponseEntity deleteMember(@RequestBody AdminMemberDTO memberDTO){
         return ResponseMessage
                 .SuccessResponse(memberDTO.getMemberId() + "회원 삭제 성공", adminMemberService.deleteMember(memberDTO));
     }
     @PostMapping("/member/auth")
-    public ResponseEntity authMember(@RequestBody AdminMemberDTO memberDTO){
+    public ResponseEntity authMember(@RequestBody AdminManagerDTO managerDTO){
         return ResponseMessage
-                .SuccessResponse(memberDTO.getMemberId() + " 회원 권한 변경", adminMemberService.changeMemberAuthorization(memberDTO));
+                .SuccessResponse(managerDTO.getStoreName() + " 회원 권한 변경", adminMemberService.changeMemberAuthorization(managerDTO));
     }
     @PostMapping("/member/search")
     public ResponseEntity searchMember(@RequestBody Map<String, String> requestBody){
 
         return ResponseMessage
                 .SuccessResponse(requestBody.get("search") + " 단어 검색 성공", adminMemberService.searchMembers(requestBody.get("search")));
     }
-    @GetMapping("/member/detail/{memberId}")
-    public ResponseEntity getMemberDetail(@PathVariable String memberId){
-        return ResponseMessage
-                .SuccessResponse( "회원 조회 성공", adminMemberService.getMemberDetail(memberId));
-    }
 
     @GetMapping("/member/excelDown")
     public void excelDown(HttpServletResponse response) throws Exception{

src/main/java/com/hyundai/domain/admin/controller/AdminProductController.java

@@ -42,6 +42,7 @@ public ResponseEntity addTheme(@RequestBody AdminThemeDTO paramDTO){
         adminProductService.addTheme(paramDTO);
         return ResponseMessage.SuccessResponse("테마를 추가하셨습니다.", " ");
     }
+
     @PostMapping("/products/theme/delete")
     public ResponseEntity deleteTheme(@RequestBody AdminThemeDTO paramDTO){
         adminProductService.deleteTheme(paramDTO);

src/main/java/com/hyundai/domain/admin/dto/AdminManagerDTO.java

@@ -0,0 +1,33 @@
+package com.hyundai.domain.admin.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author : 강은구
+ * @fileName : AdminManagerDTO
+ * @description :
+ * @since : 03/01/2024
+ */
+
+@Getter
+@Setter
+@AllArgsConstructor
+@RequiredArgsConstructor
+public class AdminManagerDTO {
+    private String storeId;
+    private String storeName;
+    private String storeTel;
+    private String memberId;
+    private String memberName;
+    private String memberPhone;
+    private String memberEmail;
+    private String infoAddr;
+    private String infoZipcode;
+    private LocalDateTime memberCreatedDate;
+    private LocalDateTime storeApprovedDate;
+}

src/main/java/com/hyundai/domain/admin/dto/AdminMemberDTO.java

@@ -1,9 +1,11 @@
 package com.hyundai.domain.admin.dto;
 
 import com.hyundai.domain.login.entity.enumtype.Role;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Getter
@@ -17,11 +19,13 @@ public class AdminMemberDTO {
     private String memberName;
     private String memberNickname;
     private String memberPhone;
-    private String memberImage;
     private int memberGender;
-    private LocalDate memberBirth;
+    private String memberBirth;
     private Role memberRole;
     private LocalDateTime createdDate;
     private LocalDateTime modifiedDate;
     private LocalDateTime deletedDate;
+
+    private String infoAddr;
+    private String infoZipcode;
 }

src/main/java/com/hyundai/domain/admin/service/AdminMemberService.java

@@ -1,29 +1,25 @@
 package com.hyundai.domain.admin.service;
 
+import com.hyundai.domain.admin.dto.AdminManagerDTO;
 import com.hyundai.domain.admin.dto.AdminMemberDTO;
-import com.hyundai.domain.admin.dto.AdminMemberParamDTO;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 
 public interface AdminMemberService {
-    List<AdminMemberDTO> getMemberList(AdminMemberParamDTO paramDTO);
-
-    List<AdminMemberDTO> getMemberListByPage(AdminMemberParamDTO paramDTO, Long pageNum);
+    List<AdminMemberDTO> getMemberList();
 
     String modifyMember(AdminMemberDTO member);
 
     String deleteMember(AdminMemberDTO member);
 
-    String changeMemberAuthorization(AdminMemberDTO member);
-
+    String changeMemberAuthorization(AdminManagerDTO member);
 
     void getMemberExcelFile(HttpServletResponse response) throws IOException;
 
     List<AdminMemberDTO> searchMembers(String word);
 
-    AdminMemberDTO getMemberDetail(String memberId);
-
+    List<AdminManagerDTO> getManagerList();
 
 }

src/main/java/com/hyundai/domain/admin/service/AdminMemberServiceImpl.java

@@ -1,7 +1,7 @@
 package com.hyundai.domain.admin.service;
 
+import com.hyundai.domain.admin.dto.AdminManagerDTO;
 import com.hyundai.domain.admin.dto.AdminMemberDTO;
-import com.hyundai.domain.admin.dto.AdminMemberParamDTO;
 import com.hyundai.domain.utils.file.DownExcelView;
 import com.hyundai.global.exception.GlobalErrorCode;
 import com.hyundai.global.exception.GlobalException;
@@ -26,19 +26,8 @@ public class AdminMemberServiceImpl implements AdminMemberService{
 
     @Override
     @Transactional(readOnly = true)
-    public List<AdminMemberDTO> getMemberList(AdminMemberParamDTO paramDTO) {
-        return adminMemberMapper.getListByParams(paramDTO);
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public List<AdminMemberDTO> getMemberListByPage(AdminMemberParamDTO paramDTO, Long pageNum) {
-        paramDTO.setPageNum(pageNum);
-        if(adminMemberMapper.getListByParams(paramDTO).isEmpty()){
-            throw new GlobalException(GlobalErrorCode.NOT_HAVING_DATA);
-        }
-
-        return adminMemberMapper.getListByParams(paramDTO);
+    public List<AdminMemberDTO> getMemberList() {
+        return adminMemberMapper.getAllMembers();
     }
 
     @Override
@@ -64,7 +53,7 @@ public String deleteMember(AdminMemberDTO member) {
     }
 
     @Override
-    public String changeMemberAuthorization(AdminMemberDTO member) {
+    public String changeMemberAuthorization(AdminManagerDTO member) {
         try{
             adminMemberMapper.grantAuthorization(member);
             return "성공";
@@ -74,16 +63,14 @@ public String changeMemberAuthorization(AdminMemberDTO member) {
 
     }
 
-
-
     @Override
     public List<AdminMemberDTO> searchMembers(String word) {
         return adminMemberMapper.searchMembers(word);
     }
 
     @Override
-    public AdminMemberDTO getMemberDetail(String memberId) {
-        return adminMemberMapper.getMemberDetail(memberId);
+    public List<AdminManagerDTO> getManagerList() {
+        return adminMemberMapper.getAllManagers();
     }
 
     @Override

src/main/java/com/hyundai/domain/manager/controller/ManagerProductController.java

@@ -1,14 +1,11 @@
 package com.hyundai.domain.manager.controller;
 
-import com.hyundai.domain.login.security.CustomMemberDetails;
 import com.hyundai.domain.manager.dto.ManagerProductDTO;
 import com.hyundai.domain.manager.service.ManagerProductService;
 import com.hyundai.global.message.ResponseMessage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
@@ -56,5 +53,4 @@ public ResponseEntity<?> deleteProductIngTheme(@RequestBody Map<String,Object> p
     public ResponseEntity<?> orderProduct(){
         return ResponseMessage.SuccessResponse("주문한 상품을 불러왔습니다. ", managerProductService.getOrdersByMemberId());
     }
-
-}
+}

src/main/java/com/hyundai/global/config/SecurityConfig.java

@@ -4,6 +4,8 @@
 import com.hyundai.domain.login.security.CustomDeniedHandler;
 import com.hyundai.domain.login.security.JwtFilter;
 import com.hyundai.domain.login.security.JwtProvider;
+import com.hyundai.global.filter.LogFilter;
+import com.hyundai.global.mapper.LogMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -34,6 +36,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     private final JwtProvider jwtProvider;
     private final CustomAuthenticationEntryPoint customAuthenticationEntryPoint;
     private final CustomDeniedHandler customDeniedHandler;
+    private final LogMapper logMapper;
 
     @Override
     @Bean
@@ -89,7 +92,8 @@ protected void configure(HttpSecurity http) throws Exception {
                 .permitAll() // 누구나 접근 가능
                 .anyRequest().authenticated()
                 .and()
-                .addFilterBefore(new JwtFilter(jwtProvider), UsernamePasswordAuthenticationFilter.class);
+                .addFilterBefore(new JwtFilter(jwtProvider), UsernamePasswordAuthenticationFilter.class)
+                .addFilterAfter(new LogFilter(logMapper), JwtFilter.class);
     }
 
 

src/main/java/com/hyundai/global/config/WebMvcConfig.java

@@ -1,26 +1,25 @@
 package com.hyundai.global.config;
-
-
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.*;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 
 @Slf4j
 @EnableWebMvc
 @Configuration
 @RequiredArgsConstructor
 public class WebMvcConfig implements WebMvcConfigurer {
-
     private final ApplicationProperties properties;
 
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-                .allowedOrigins(properties.getFRONT_LOCAL_URL() )
-                .allowedMethods("OPTIONS","GET","POST","PUT","DELETE");
+                .allowedOrigins(properties.getFRONT_LOCAL_URL())
+                .allowedMethods("OPTIONS", "GET", "POST", "PUT", "DELETE");
     }
 
     @Override
@@ -31,4 +30,5 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry.addResourceHandler("/webjars/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/");
     }
+
 }