Merge branch 'develop' of github.com:FITPET-A/FITPET_BE into develop

.github/workflows/docker.yml

@@ -66,6 +66,7 @@ jobs:
 
           echo "Starting new Docker container fitpet-container..."
           sudo docker run -d -p 8080:8080 --name fitpet-container \
+            -e DB_URL=${{ secrets.DB_URL }} \
             -e DB_USERNAME=${{ secrets.DB_USERNAME }} \
             -e DB_PASSWORD=${{ secrets.DB_PASSWORD }} \
             -e ACCESS_TOKEN_EXP=${{ secrets.ACCESS_TOKEN_EXP }} \

README.md

@@ -1,7 +1,12 @@
 # FITPET_BE
-대학생 IT경영학회 큐시즘 30기 기업 프로젝트 : FITPET A조 Backend Repository
+대학생 IT경영학회 큐시즘 30기 기업 프로젝트 : FITPET A조 Backend Repository <br>
+2024.08.19 ~ 2024.09.08
+
+![1](https://github.com/user-attachments/assets/0f660c6e-7207-4f7f-b101-f687bd0e12bc) 
+<br><br><br>
+
+
 
-<br><br>
 
 ## Member
 |      김다은       |          김수진        |                                                                                                   
@@ -10,8 +15,45 @@
 |   [@daeun084](https://github.com/daeun084)   |    [@cowboysj](https://github.com/cowboysj)  | 
 | 숭실대학교 컴퓨터학부 | 경희대학교 컴퓨터공학과 | 
 
+<br><br><br>
+
+
+## Stack
+**Language & Framework**  
+<img src="https://img.shields.io/badge/Java-007396?style=flat&logo=Java&logoColor=white" />
+<img src="https://img.shields.io/badge/Spring Boot-6DB33F?style=flat&logo=SpringBoot&logoColor=white" /> 
+<img src="https://img.shields.io/badge/Spring Security-6DB33F?style=flat&logo=SpringSecurity&logoColor=white" />
+
+
+**Documentation**  
+<img src="https://img.shields.io/badge/Rest Docs-6DB33F?style=flat&logo=Spring&logoColor=white" /> 
+<img src="https://img.shields.io/badge/Swagger-85EA2D?style=flat&logo=Swagger&logoColor=black" />
+
+**Database & ORM**  
+<img src="https://img.shields.io/badge/Spring Data JPA-6DB33F?style=flat&logo=Spring&logoColor=white" /> 
+<img src="https://img.shields.io/badge/MySQL-4479A1?style=flat&logo=MySQL&logoColor=white" /> 
+
+**Build Tool**  
+<img src="https://img.shields.io/badge/Gradle-02303A?style=flat&logo=Gradle&logoColor=white" />
+
+**Cloud & Hosting**  
+<img src="https://img.shields.io/badge/AmazonEC2-FF9900?style=flat&logo=AmazonEC2&logoColor=white" /> 
+<img src="https://img.shields.io/badge/AmazonRDS-527FFF?style=flat&logo=AmazonRDS&logoColor=white" /> 
+
+**Containerization & CI/CD**  
+<img src="https://img.shields.io/badge/Docker-2496ED?style=flat&logo=Docker&logoColor=white" /> 
+<img src="https://img.shields.io/badge/GithubActions-2088FF?style=flat&logo=GithubActions&logoColor=white" />
+
+<br><br><br>
+
+
+## Architecture
+![image](https://github.com/user-attachments/assets/55b51461-42d4-4105-99bf-8f930a1266db) <br><br><br>
+
+
+## ERD
+![20](https://github.com/user-attachments/assets/b9384cc6-e3cf-4405-9c5f-057c09523ab5) <br><br><br>
 
-<br><br>
 
 ## Convention
 
@@ -31,8 +73,8 @@
 | `test` | 테스트 코드 추가 및 수정, 삭제 |
 | `refactor` | 코드 리팩토링 |
 
+<br><br><br>
 
-<br><br>
 
 
 ## Branch
@@ -41,10 +83,10 @@
 - pull request를 통해 develop branch에 merge 후, branch delete
 - 부득이하게 develop branch에 직접 commit 해야 할 경우, `!hotfix:` 사용
 
+<br><br><br>
 
-<br><br>
 
-## Dir
+## Directory
 
 ```PlainText
 src/
@@ -66,10 +108,14 @@ src/
 └── dto/
     ├── request/
     └── response/
-
-			 
+		 
 ```
 
+<br><br><br>
+
+
+
+
 ## 부하 테스트 
 가장 요청이 많을 것으로 예상되는 `견적서 요청 API`에 대해 K6을 이용해 부하테스트를 진행했습니다.
 

src/main/java/FITPET/dev/service/AdminService.java

@@ -55,6 +55,7 @@ public AdminResponse.SignDto signUp(AdminRequest.SignUpDto signUpDto) {
      * @param signInDto
      * @return
      */
+    @Transactional
     public AdminResponse.SignDto signIn(AdminRequest.SignInDto signInDto) {
         Admin admin = findAdminById(signInDto.getId());
 

src/main/java/FITPET/dev/service/ComparisonService.java

@@ -58,6 +58,7 @@ public class ComparisonService {
      * @param request
      * @return
      */
+    @Transactional
     public ComparisonResponse.ComparisonDto createComparisonAndGetInsurance(ComparisonRequest request) {
         validatePhoneNumber(request.getPhoneNumber());
         validateAge(request.getPetAge());
@@ -81,24 +82,6 @@ public ComparisonResponse.ComparisonDto createComparisonAndGetInsurance(Comparis
     }
 
 
-    /*
-     * default 값으로 보험료 조회
-     * @param petInfo
-     * @return
-     */
-    public InsuranceResponse.InsuranceListDto getInsurancePremiumsByPetInfo(PetInfo petInfo) {
-
-        String detailType = petInfo.getPet().getPetSpecies();
-        int age = petInfo.getAge();
-        String renewalCycle = "3년";
-        String deductible = "1만원";
-        String coverageRatio = "70";
-        String compensation = "15만";
-
-        return insuranceService.getInsurancePremium(detailType, age, renewalCycle, coverageRatio, deductible, compensation);
-    }
-
-
     public InsuranceResponse.InsuranceListDto getInsurancePremiumsByPetInfoAndCoverageRatio(PetInfo petInfo, String coverageRatio) {
 
         String detailType = petInfo.getPet().getPetSpecies();
@@ -188,11 +171,6 @@ public ComparisonResponse.ComparisonDto patchComparisonStatus(Long comparisonId,
         // 견적서 단일 조회
         Comparison comparison = findComparisonById(comparisonId);
 
-        // validate status
-        ComparisonStatus currentComparisonStatus = comparison.getStatus();
-        if (currentComparisonStatus.getIndex() > comparisonStatus.getIndex())
-            throw new GeneralException(ErrorStatus.INVALID_PATCH_PERIOR_STATUS);
-
         // patch status
         comparison.updateStatus(comparisonStatus);
         return ComparisonConverter.toComparisonDto(comparison);
@@ -217,7 +195,6 @@ public ComparisonResponse.ComparisonPageDto searchComparisons(String content, in
      * ComparisonId들 받아서 삭제
      * @param ComparisonId
      */
-
     @Transactional
     public void deleteComparison(Long comparisonId) {
         Comparison comparison = findComparisonById(comparisonId);

src/main/java/FITPET/dev/service/InquiryService.java

@@ -88,11 +88,6 @@ public InquiryResponse.InquiryDto patchInquiryStatus(Long inquiryId, InquiryStat
         // 1:1 문의 단일 조회
         Inquiry inquiry = findInquiryById(inquiryId);
 
-        // validate status
-        InquiryStatus currentInquiryStatus = inquiry.getStatus();
-        if (currentInquiryStatus.getIndex() > inquiryStatus.getIndex())
-            throw new GeneralException(ErrorStatus.INVALID_PATCH_PERIOR_STATUS);
-
         // patch status
         inquiry.updateStatus(inquiryStatus);
         return InquiryConverter.toInquiryDto(inquiry);

src/main/java/FITPET/dev/service/InsuranceService.java

@@ -78,17 +78,6 @@ public InsuranceResponse.InsuranceListDto getInsurancePremium(
     }
 
 
-    /*
-     * 상세 품종명으로 Pet 객체를 찾아 반환
-     * @param detailType
-     * @return
-     */
-    private Pet findPetByPetSpecies(String petSpecies){
-        return petRepository.findByPetSpecies(petSpecies)
-                .orElseThrow(() -> new GeneralException(ErrorStatus.NOT_EXIST_PET));
-    }
-
-
     /*
      * 필드 정보들을 만족하는 insurance 객체들을 찾아 리스트로 반환
      * @param pet
@@ -181,6 +170,7 @@ public List<InsuranceHistoryResponse> getPremiumHistory(Long insuranceId) {
     /*
      * 보험 정보 추가
      */
+    @Transactional
     public InsuranceResponse.InsuranceDetailDto addInsurance(InsuranceRequest request) {
         Insurance insurance = InsuranceConverter.RequestToInsurance(request);
         insuranceRepository.save(insurance);
@@ -246,6 +236,17 @@ private void saveInsuranceHistory(Insurance insurance, int oldPremium, int newPr
     }
 
 
+    /*
+     * 상세 품종명으로 Pet 객체를 찾아 반환
+     * @param detailType
+     * @return
+     */
+    private Pet findPetByPetSpecies(String petSpecies){
+        return petRepository.findByPetSpecies(petSpecies)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.NOT_EXIST_PET));
+    }
+
+
     private Insurance findInsuranceById(Long insuranceId){
         return insuranceRepository.findByInsuranceId(insuranceId)
                 .orElseThrow(() -> new GeneralException(ErrorStatus.NOT_EXIST_INSURANCE));

src/main/java/FITPET/dev/service/ProposalService.java

@@ -82,11 +82,6 @@ public ProposalResponse.ProposalPageDto getProposals(String startDate, String en
     public ProposalResponse.ProposalDto patchProposalStatus(Long proposalId, ProposalStatus proposalStatus) {
         Proposal proposal = findProposalById(proposalId);
 
-        // validate status
-        ProposalStatus currentProposalStatus = proposal.getStatus();
-        if (currentProposalStatus.getIndex() > proposalStatus.getIndex())
-            throw new GeneralException(ErrorStatus.INVALID_PATCH_PERIOR_STATUS);
-
         // patch status
         proposal.updateStatus(proposalStatus);
         return ProposalConverter.toProposalDto(proposal);

src/main/java/FITPET/dev/service/ReferSiteService.java

@@ -29,11 +29,6 @@ public class ReferSiteService {
 
     private final ReferSiteRepository referSiteRepository;
 
-    private ReferSite findReferSiteById(Long referSiteId) {
-        return referSiteRepository.findByIdAndNotDeleted(referSiteId)
-                .orElseThrow(() -> new GeneralException(ErrorStatus.NOT_EXIST_REFERSITE));
-    }
-
     /*
      * 신규 유입채널 추가
      */
@@ -85,4 +80,9 @@ public ReferSiteResponse.ReferSitePageDto searchReferSite(String content, int pa
 
         return ReferSiteConverter.toReferSitePageDto(referSitePage);
     }
+
+    private ReferSite findReferSiteById(Long referSiteId) {
+        return referSiteRepository.findByIdAndNotDeleted(referSiteId)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.NOT_EXIST_REFERSITE));
+    }
 }

src/main/resources/application.yml

@@ -3,7 +3,7 @@ spring:
     name: dev
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://fitpet-a-db.cj8cios80977.ap-northeast-2.rds.amazonaws.com:3306/fitpet_a_db
+    url: ${DB_URL}
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
   sql: