Merge branch 'main' of https://github.com/9oormthon-univ/2024_DANPOON…

…G_TEAM_43_BE
9oormthon-univ · Dec 7, 2024 · b63ad33 · b63ad33
2 parents d26981e + f4cfacc
commit b63ad33
Show file tree

Hide file tree

Showing 48 changed files with 126 additions and 272 deletions.
diff --git a/src/main/java/com/carely/backend/controller/CertificateController.java b/src/main/java/com/carely/backend/controller/CertificateController.java
@@ -14,7 +14,8 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import java.util.List;
+import java.util.UUID;
 
 @RestController
 @RequestMapping("/api/certificates")

diff --git a/src/main/java/com/carely/backend/controller/EasyCodefController.java b/src/main/java/com/carely/backend/controller/EasyCodefController.java
@@ -6,10 +6,9 @@
 import com.carely.backend.dto.easyCodef.RequestUserIdentityDTO;
 import com.carely.backend.dto.easyCodef.UserIdentityDTO;
 import com.carely.backend.dto.response.ResponseDTO;
-import com.carely.backend.exception.IdentityNotAcceptableException;
-import com.carely.backend.exception.ObjectNullException;
-import com.carely.backend.service.CacheService;
-import com.carely.backend.service.EasyCodef.*;
+import com.carely.backend.service.easyCodef.EasyCodef;
+import com.carely.backend.service.easyCodef.EasyCodefProperties;
+import com.carely.backend.service.easyCodef.EasyCodefResponse;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
@@ -156,7 +155,7 @@ private boolean processAdditionalAuth(UserIdentityDTO userIdentityDTO, String jt
             System.out.println("Additional Info API Response Code: " + code);
 
             if (Objects.equals(code, "CF-00000")) {
-                finalResponse.set(new ResponseDTO(SuccessCode.SUCCESS_GET_IDENTITY, "Authentication successful"));
+                finalResponse.set(new ResponseDTO<>(SuccessCode.SUCCESS_GET_IDENTITY, "Authentication successful"));
                 return true; // 성공
             }
         } catch (Exception e) {

diff --git a/src/main/java/com/carely/backend/controller/GroupController.java b/src/main/java/com/carely/backend/controller/GroupController.java
@@ -9,11 +9,9 @@
 import com.carely.backend.dto.user.UserResponseDTO;
 import com.carely.backend.service.GroupService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.List;

diff --git a/src/main/java/com/carely/backend/controller/GuestBookController.java b/src/main/java/com/carely/backend/controller/GuestBookController.java
@@ -5,7 +5,6 @@
 import com.carely.backend.controller.docs.GuestBookAPI;
 import com.carely.backend.dto.guestBook.RequestGuestBookDTO;
 import com.carely.backend.dto.guestBook.ResponseGroupGuestbookDTO;
-import com.carely.backend.dto.guestBook.ResponseGuestBookDTO;
 import com.carely.backend.dto.response.ResponseDTO;
 import com.carely.backend.dto.user.CustomUserDetails;
 import com.carely.backend.service.GuestBookService;

diff --git a/src/main/java/com/carely/backend/controller/OCRController.java b/src/main/java/com/carely/backend/controller/OCRController.java
@@ -1,14 +1,14 @@
 package com.carely.backend.controller;
 
 import com.carely.backend.code.SuccessCode;
-import com.carely.backend.dto.certificate.CertificateDTO;
 import com.carely.backend.dto.response.ResponseDTO;
-import com.carely.backend.dto.user.CustomUserDetails;
 import com.carely.backend.service.ocr.OCRService;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 @RestController
@@ -21,7 +21,7 @@ public OCRController(OCRService ocrService) {
         this.ocrService = ocrService;
     }
     @PostMapping(value = "/extract", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<ResponseDTO<?>> extractText(@RequestPart("file") MultipartFile file) throws Exception {
+    public ResponseEntity<ResponseDTO<?>> extractText(@RequestPart("file") MultipartFile file) {
 //        if (user.getUsername() == null) {
 //            // 가입 안 된 유저... 1을 보내주거나 해야 함....
 //            // 생년월일, 이름 있어야 함... 그래야 자격증 검증 가능할 듯?

diff --git a/src/main/java/com/carely/backend/controller/UserController.java b/src/main/java/com/carely/backend/controller/UserController.java
@@ -18,7 +18,6 @@
 import io.jsonwebtoken.ExpiredJwtException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

diff --git a/src/main/java/com/carely/backend/controller/VolunteerController.java b/src/main/java/com/carely/backend/controller/VolunteerController.java
@@ -10,7 +10,6 @@
 import com.carely.backend.dto.volunteer.CreateVolunteerDTO;
 import com.carely.backend.dto.volunteer.GetVolunteerInfoDTO;
 import com.carely.backend.dto.volunteer.UpdateVolunteerApprovalDTO;
-import com.carely.backend.service.UserService;
 import com.carely.backend.service.VolunteerService;
 import com.carely.backend.service.chat.ChatService;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/src/main/java/com/carely/backend/controller/docs/OcrAPI.java b/src/main/java/com/carely/backend/controller/docs/OcrAPI.java
@@ -14,8 +14,6 @@
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
-
 public interface OcrAPI {
 
     @Operation(summary = "OCR 검증하기", description = "파일을 올리면 검증된 결과가 나옵니다.")

diff --git a/src/main/java/com/carely/backend/domain/Group.java b/src/main/java/com/carely/backend/domain/Group.java
@@ -2,7 +2,6 @@
 
 
 import com.carely.backend.domain.common.BaseEntity;
-import com.carely.backend.domain.enums.UserType;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

diff --git a/src/main/java/com/carely/backend/domain/User.java b/src/main/java/com/carely/backend/domain/User.java
@@ -1,7 +1,7 @@
 package com.carely.backend.domain;
 
 import com.carely.backend.domain.common.BaseEntity;
-import com.carely.backend.domain.enums.*;
+import com.carely.backend.domain.enums.UserType;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

diff --git a/src/main/java/com/carely/backend/dto/certificate/CertificateDTO.java b/src/main/java/com/carely/backend/dto/certificate/CertificateDTO.java
@@ -1,13 +1,9 @@
 package com.carely.backend.dto.certificate;
 
 
-import lombok.Builder;
-import lombok.Data;
-
 import lombok.Builder;
 import lombok.Data;
 import org.web3j.abi.datatypes.DynamicStruct;
-import org.web3j.abi.datatypes.Type;
 
 @Data
 @Builder

diff --git a/src/main/java/com/carely/backend/dto/certificate/volunteerDTO.java b/src/main/java/com/carely/backend/dto/certificate/volunteerDTO.java
@@ -3,7 +3,6 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
-import org.web3j.abi.datatypes.Address;
 
 @Getter
 @Setter

diff --git a/src/main/java/com/carely/backend/dto/chat/ChatRoomDTO.java b/src/main/java/com/carely/backend/dto/chat/ChatRoomDTO.java
@@ -1,6 +1,5 @@
 package com.carely.backend.dto.chat;
 
-import com.carely.backend.domain.ChatRoomEntity;
 import lombok.Getter;
 import lombok.Setter;
 

diff --git a/src/main/java/com/carely/backend/dto/group/CreateGroupDTO.java b/src/main/java/com/carely/backend/dto/group/CreateGroupDTO.java
@@ -2,7 +2,6 @@
 
 
 import com.carely.backend.domain.Group;
-import com.carely.backend.domain.enums.UserType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;

diff --git a/src/main/java/com/carely/backend/dto/group/GetGroupDTO.java b/src/main/java/com/carely/backend/dto/group/GetGroupDTO.java
@@ -1,6 +1,6 @@
 package com.carely.backend.dto.group;
+
 import com.carely.backend.domain.Group;
-import com.carely.backend.domain.enums.UserType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;

diff --git a/src/main/java/com/carely/backend/dto/news/CreateCommentDTO.java b/src/main/java/com/carely/backend/dto/news/CreateCommentDTO.java
@@ -1,6 +1,5 @@
 package com.carely.backend.dto.news;
 
-import com.carely.backend.domain.News;
 import com.carely.backend.domain.NewsComment;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;

diff --git a/src/main/java/com/carely/backend/dto/news/CreateNewsDTO.java b/src/main/java/com/carely/backend/dto/news/CreateNewsDTO.java
@@ -1,7 +1,6 @@
 package com.carely.backend.dto.news;
 
 import com.carely.backend.domain.News;
-import com.carely.backend.domain.enums.UserType;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

diff --git a/src/main/java/com/carely/backend/dto/news/NewsResponseDTO.java b/src/main/java/com/carely/backend/dto/news/NewsResponseDTO.java
@@ -10,9 +10,7 @@
 
 import java.time.LocalDateTime;
 import java.util.Comparator;
-import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 public class NewsResponseDTO {
     @Getter

diff --git a/src/main/java/com/carely/backend/dto/user/MapUserDTO.java b/src/main/java/com/carely/backend/dto/user/MapUserDTO.java
@@ -2,18 +2,15 @@
 
 import com.carely.backend.domain.User;
 import com.carely.backend.domain.enums.UserType;
-import com.carely.backend.service.kakao.KakaoAddressService;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.*;
 import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.util.Map;
 
 @Getter
 @Builder

diff --git a/src/main/java/com/carely/backend/dto/user/MyPageDTO.java b/src/main/java/com/carely/backend/dto/user/MyPageDTO.java
@@ -2,20 +2,17 @@
 
 import com.carely.backend.domain.User;
 import com.carely.backend.domain.enums.UserType;
-import com.carely.backend.dto.guestBook.ResponseGroupGuestbookDTO;
 import com.carely.backend.dto.guestBook.UserDetailGuestBookDTO;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.*;
+import org.json.JSONObject;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.List;
 
-import org.json.JSONObject;
-import org.web3j.abi.datatypes.Int;
-
 
 @Getter
 public class MyPageDTO {

diff --git a/src/main/java/com/carely/backend/dto/user/RecommandUserDTO.java b/src/main/java/com/carely/backend/dto/user/RecommandUserDTO.java
@@ -2,11 +2,8 @@
 
 import com.carely.backend.domain.User;
 import com.carely.backend.domain.enums.UserType;
-import com.carely.backend.service.kakao.KakaoAddressService;
 import lombok.*;
 
-import java.util.Map;
-
 public class RecommandUserDTO {
     @Getter
     @Builder

diff --git a/src/main/java/com/carely/backend/dto/user/RegisterDTO.java b/src/main/java/com/carely/backend/dto/user/RegisterDTO.java
@@ -8,7 +8,6 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.springframework.web.multipart.MultipartFile;
 
 @Getter
 @Builder

diff --git a/src/main/java/com/carely/backend/dto/user/UserResponseDTO.java b/src/main/java/com/carely/backend/dto/user/UserResponseDTO.java
@@ -7,7 +7,6 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.web3j.abi.datatypes.Int;
 
 @Getter
 @Builder

diff --git a/src/main/java/com/carely/backend/dto/volunteer/GetVolunteerInfoDTO.java b/src/main/java/com/carely/backend/dto/volunteer/GetVolunteerInfoDTO.java
@@ -1,7 +1,6 @@
 package com.carely.backend.dto.volunteer;
 
 
-import com.carely.backend.domain.Memo;
 import com.carely.backend.domain.User;
 import com.carely.backend.domain.Volunteer;
 import com.carely.backend.domain.enums.VolunteerType;

diff --git a/src/main/java/com/carely/backend/repository/GroupRepository.java b/src/main/java/com/carely/backend/repository/GroupRepository.java
@@ -2,13 +2,11 @@
 
 import com.carely.backend.domain.Group;
 import com.carely.backend.domain.User;
-import com.carely.backend.domain.Volunteer;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;
-import java.util.Set;
 
 public interface GroupRepository extends JpaRepository<Group, Long> {
     List<Group> findAllByCity(String city);

diff --git a/src/main/java/com/carely/backend/repository/GuestBookRepository.java b/src/main/java/com/carely/backend/repository/GuestBookRepository.java
@@ -1,13 +1,9 @@
 package com.carely.backend.repository;
 
 import com.carely.backend.domain.GuestBookEntity;
-import com.carely.backend.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-import java.util.Optional;
-
 @Repository
 public interface GuestBookRepository extends JpaRepository<GuestBookEntity, Long> {
     //@Query("SELECT g FROM GuestBookEntity g WHERE g.id = :id")

diff --git a/src/main/java/com/carely/backend/repository/LikeRepository.java b/src/main/java/com/carely/backend/repository/LikeRepository.java
@@ -6,8 +6,6 @@
 import com.carely.backend.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import javax.swing.text.html.Option;
-import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 

diff --git a/src/main/java/com/carely/backend/repository/UserRepository.java b/src/main/java/com/carely/backend/repository/UserRepository.java
@@ -4,7 +4,6 @@
 import com.carely.backend.domain.enums.UserType;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import javax.swing.text.html.Option;
 import java.util.List;
 import java.util.Optional;
 

diff --git a/src/main/java/com/carely/backend/repository/VolunteerRepository.java b/src/main/java/com/carely/backend/repository/VolunteerRepository.java
@@ -1,7 +1,6 @@
 package com.carely.backend.repository;
 
 
-import com.carely.backend.domain.GuestBookEntity;
 import com.carely.backend.domain.User;
 import com.carely.backend.domain.Volunteer;
 import org.springframework.data.jpa.repository.JpaRepository;

diff --git a/src/main/java/com/carely/backend/service/CacheService.java b/src/main/java/com/carely/backend/service/CacheService.java
@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import java.util.concurrent.ConcurrentHashMap;
+
 import java.util.concurrent.TimeUnit;
 
 @Service

diff --git a/src/main/java/com/carely/backend/service/GroupService.java b/src/main/java/com/carely/backend/service/GroupService.java
@@ -1,27 +1,26 @@
 package com.carely.backend.service;
 
 
-import com.carely.backend.domain.*;
-import com.carely.backend.domain.enums.UserType;
+import com.carely.backend.domain.Group;
+import com.carely.backend.domain.JoinGroup;
+import com.carely.backend.domain.User;
+import com.carely.backend.domain.Volunteer;
 import com.carely.backend.dto.group.CreateGroupDTO;
 import com.carely.backend.dto.group.GetGroupDTO;
-import com.carely.backend.dto.guestBook.ResponseGroupGuestbookDTO;
-import com.carely.backend.dto.guestBook.ResponseGuestBookDTO;
 import com.carely.backend.dto.user.UserResponseDTO;
-import com.carely.backend.exception.*;
+import com.carely.backend.exception.AlreadyInGroupException;
+import com.carely.backend.exception.GroupNotFoundException;
+import com.carely.backend.exception.NotUserInGroupException;
+import com.carely.backend.exception.NotWriterException;
 import com.carely.backend.repository.*;
 import com.carely.backend.service.s3.S3Uploader;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.xml.stream.events.Comment;
-import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -37,7 +36,7 @@ public class GroupService {
     private final GuestBookRepository guestBookRepository;
 
 
-    public CreateGroupDTO.Res createCaregiverGroup(String kakaoId, CreateGroupDTO groupDTO) throws IOException {
+    public CreateGroupDTO.Res createCaregiverGroup(String kakaoId, CreateGroupDTO groupDTO) {
         User user = userRepository.findByKakaoId(kakaoId)
                 .orElseThrow(() -> new UsernameNotFoundException("사용자를 찾을 수 없습니다."));
 

diff --git a/src/main/java/com/carely/backend/service/GuestBookService.java b/src/main/java/com/carely/backend/service/GuestBookService.java
@@ -6,7 +6,6 @@
 import com.carely.backend.domain.enums.UserType;
 import com.carely.backend.dto.guestBook.RequestGuestBookDTO;
 import com.carely.backend.dto.guestBook.ResponseGroupGuestbookDTO;
-import com.carely.backend.dto.guestBook.ResponseGuestBookDTO;
 import com.carely.backend.exception.*;
 import com.carely.backend.repository.GroupRepository;
 import com.carely.backend.repository.GuestBookRepository;
@@ -17,7 +16,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;