Merge branch 'release/v1.0'

Author: WONSEOKJE

.gitignore

@@ -184,4 +184,7 @@ gradle-app.setting
 ### Gradle Patch ###
 # Java heap dump
 *.hprof
+
+application.yml
+keystore.p12
 # End of https://www.toptal.com/developers/gitignore/api/macos,windows,intellij+iml,gradle,java,vim,git

build.gradle

@@ -26,6 +26,17 @@ dependencies {
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
+	//시큐리티
+	implementation 'org.springframework.boot:spring-boot-starter-security'
+	testImplementation 'org.springframework.security:spring-security-test'
+	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
+
+	//jwt
+	implementation 'io.jsonwebtoken:jjwt:0.9.1'
+
+	//mail
+	implementation 'org.springframework.boot:spring-boot-starter-mail'
 }
 
 tasks.named('test') {

src/main/java/com/example/miniprojectbe/controller/BasketController.java

@@ -0,0 +1,45 @@
+package com.example.miniprojectbe.controller;
+
+import com.example.miniprojectbe.service.BasketService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+
+@RestController
+@RequiredArgsConstructor
+@CrossOrigin(origins = "*")
+public class BasketController {
+
+    private final BasketService basketService;
+
+    // 상품 장바구니 담기
+    @PostMapping("/wish")
+    public HashMap<String, String> addCart(@RequestHeader(name = "Authorization") String header, Long itemId) {
+        return basketService.addCart(header, itemId);
+    }
+
+    // 장바구니 조회 (예적금)
+    @GetMapping("/wish_list/deposit")
+    public HashMap<String, Object> getDepositCartList(@RequestHeader(name = "Authorization") String header, @RequestParam int page) {
+        return basketService.getDepositCartList(header, page);
+    }
+
+    // 장바구니 조회 (대출)
+    @GetMapping("/wish_list/loan")
+    public HashMap<String, Object> getLoanCartList(@RequestHeader(name = "Authorization") String header, @RequestParam int page) {
+        return basketService.getLoanCartList(header, page);
+    }
+
+    // 장바구니 상품 삭제 (1개)
+    @DeleteMapping("/wish/delete/{basketId}")
+    public HashMap<String, String> deleteCartByBasketId(@PathVariable Long basketId) {
+        return basketService.deleteCartByBasketId(basketId);
+    }
+
+    // 장바구니 비우기 (나의 장바구니에 담긴 상품 전체 삭제)
+    @DeleteMapping("/wish/delete_all")
+    public HashMap<String, String> deleteAllCartsByHeader(@RequestHeader(name = "Authorization") String header) {
+        return basketService.deleteAllCartsByHeader(header);
+    }
+}

src/main/java/com/example/miniprojectbe/controller/MemberController.java

@@ -0,0 +1,82 @@
+package com.example.miniprojectbe.controller;
+
+import com.example.miniprojectbe.dto.MailDTO;
+import com.example.miniprojectbe.dto.MemberRequestDTO;
+import com.example.miniprojectbe.dto.MemberLoginDTO;
+import com.example.miniprojectbe.dto.MemberUpdateRequestDTO;
+import com.example.miniprojectbe.service.MemberService;
+import com.example.miniprojectbe.service.impl.CreateMailAndUpdatePwServiceImpl;
+import com.example.miniprojectbe.service.impl.SendMailServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+
+import java.util.HashMap;
+
+@RestController
+@RequiredArgsConstructor
+@CrossOrigin(origins = "*")
+public class MemberController {
+
+    private final MemberService memberService;
+    private final SendMailServiceImpl sendMailServiceImpl;
+    private final CreateMailAndUpdatePwServiceImpl createMailAndUpdatePwServiceImpl;
+
+    @PostMapping("/signup")
+    public HashMap<String, String> signup(MemberRequestDTO memberRequestDTO){
+        return memberService.memberSignup(memberRequestDTO);
+    }
+
+    @PostMapping("/login")
+    public HashMap<String, String> login(MemberLoginDTO memberLoginDTO) {
+        return memberService.login(memberLoginDTO);
+    }
+
+    @PostMapping("/logout")
+    public HashMap<String, String> logout(@RequestHeader(name = "Authorization") String header) {
+        return memberService.saveHeaderTokenToBlackList(header);
+    }
+
+    @PostMapping("/duplication/{memberId}")
+    public ResponseEntity<Boolean> checkEmailDuplicate(@PathVariable String memberId) {
+        return ResponseEntity.ok(memberService.checkEmailDuplicate(memberId));
+    }
+
+    @GetMapping("/find_password")
+    public HashMap<String, String> findPassword(@RequestParam(name = "memberId") String memberId,
+                                                @RequestParam(name = "name") String name) {
+        HashMap<String, String>result= new HashMap<>();
+        String resultCode = memberService.findPassword(memberId, name);
+        result.put("resultCode", resultCode);
+        return result;
+    }
+
+    @PostMapping("/find_password/send_mail")
+    public HashMap<String, String> sendMail(@RequestParam(name = "memberId") String memberId,
+                                            @RequestParam(name = "name") String name) {
+        HashMap<String, String> result = new HashMap<>();
+
+        MailDTO mailDTO = createMailAndUpdatePwServiceImpl.createMailAndChangePassword(memberId, name);
+
+        try {
+            sendMailServiceImpl.sendMail(mailDTO);
+            result.put("resultCode", "success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.put("resultCode", "failed");
+        }
+
+        return result;
+    }
+
+    @PatchMapping("/member/update")
+    public HashMap<String, String> updateMemberInfo(@RequestHeader(name = "Authorization") String header, MemberUpdateRequestDTO memberUpdateRequestDTO) {
+        return memberService.updateMemberInfo(header, memberUpdateRequestDTO);
+    }
+
+    @PostMapping("/member/info")
+    public HashMap<String, Object> getMemberInfo(@RequestHeader(name = "Authorization") String header) {
+        return memberService.getMemberInfo(header);
+    }
+}

src/main/java/com/example/miniprojectbe/controller/ProductSearchController.java

@@ -0,0 +1,31 @@
+package com.example.miniprojectbe.controller;
+
+import com.example.miniprojectbe.dto.DepositProductDTO;
+import com.example.miniprojectbe.dto.LoanProductDTO;
+import com.example.miniprojectbe.service.ProductSearchService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Slice;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@CrossOrigin(origins = "*")
+public class ProductSearchController {
+
+    private final ProductSearchService productSearchService;
+
+    @GetMapping("/search_deposit")
+    public Slice<DepositProductDTO> searchDeposit(@RequestParam String content,@RequestParam int page){
+        return productSearchService.searchDeposit(content, page);
+
+    }
+
+    @GetMapping("/search_loan")
+    public Slice<LoanProductDTO> searchLoan(@RequestParam String content,@RequestParam int page){
+        return productSearchService.searchLoan(content, page);
+
+    }
+}

src/main/java/com/example/miniprojectbe/controller/PurchaseController.java

@@ -0,0 +1,40 @@
+package com.example.miniprojectbe.controller;
+
+import com.example.miniprojectbe.service.PurchaseService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+
+@RestController
+@RequiredArgsConstructor
+@CrossOrigin(origins = "*")
+public class PurchaseController {
+
+    private final PurchaseService purchaseService;
+
+    // 상품 구매(신청)
+    @PostMapping("/purchase")
+    public HashMap<String, String> addPurchase(@RequestHeader(name = "Authorization") String header, Long itemId) {
+        return purchaseService.addPurchase(header, itemId);
+    }
+
+    // 구매(신청) 조회 (예적금)
+    @GetMapping("/deposit/purchase_list")
+    public HashMap<String, Object> getDepositPurchaseList(@RequestHeader(name = "Authorization") String header, @RequestParam int page) {
+        return purchaseService.getDepositPurchaseList(header, page);
+    }
+
+    // 구매(신청) 조회 (대출)
+    @GetMapping("/loan/purchase_list")
+    public HashMap<String, Object> getLoanPurchaseList(@RequestHeader(name = "Authorization") String header, @RequestParam int page) {
+        return purchaseService.getLoanPurchaseList(header, page);
+    }
+
+    // 상품 취소(삭제) (1개)
+    @PutMapping("/delete/purchase/{purchaseId}")
+    public HashMap<String, String> deletePurchaseByPurchaseId(@PathVariable Long purchaseId) {
+        return purchaseService.deletePurchaseByPurchaseId(purchaseId);
+    }
+
+}

src/main/java/com/example/miniprojectbe/controller/RecommendController.java

@@ -0,0 +1,53 @@
+package com.example.miniprojectbe.controller;
+
+import com.example.miniprojectbe.dto.MemberInfoResponseDTO;
+import com.example.miniprojectbe.dto.MemberLoginDTO;
+import com.example.miniprojectbe.entity.Member;
+import com.example.miniprojectbe.jwt.JwtProvider;
+import com.example.miniprojectbe.service.MemberService;
+import com.example.miniprojectbe.service.RecommendService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+
+@RestController
+@RequiredArgsConstructor
+@CrossOrigin(origins = "*")
+public class RecommendController {
+
+    private final MemberService memberService;
+    private final RecommendService recommendService;
+    private final JwtProvider jwtProvider;
+    @GetMapping("/main_recommend")
+    public HashMap<String, Object> getRecommendList(@RequestHeader(name = "Authorization") String header) {
+        MemberLoginDTO memberLoginDTO = jwtProvider.getMemberDTO(header);
+        MemberInfoResponseDTO findMember = memberService.findMemberInfoByMemberId(memberLoginDTO.getMemberId());
+        String bank = findMember.getBank();
+        String category = findMember.getCategory();
+
+        if (category.equals("정기예금") || category.equals("적금")) {
+            return recommendService.recommendDepositList(bank, category);
+        }
+        else {
+            return recommendService.recommendLoanList(bank,category);
+        }
+    }
+
+    @GetMapping("/custom_recommend")
+    public HashMap<String, Object> getCustomRecommendList(@RequestHeader(name = "Authorization") String header, @RequestParam(name = "page") int page) {
+        MemberLoginDTO memberLoginDTO = jwtProvider.getMemberDTO(header);
+        MemberInfoResponseDTO findMember = memberService.findMemberInfoByMemberId(memberLoginDTO.getMemberId());
+        String bank = findMember.getBank();
+        String category = findMember.getCategory();
+        String preference = findMember.getDistrict();
+        String target = findMember.getJob();
+
+        if (category.equals("정기예금") || category.equals("적금")) {
+            return recommendService.recommendCustomDepositList(bank, category, preference, target, page);
+        }
+        else {
+            return recommendService.recommendCustomLoanList(bank, category, preference, target, page);
+        }
+    }
+}

src/main/java/com/example/miniprojectbe/controller/SearchListController.java

@@ -0,0 +1,45 @@
+package com.example.miniprojectbe.controller;
+
+import com.example.miniprojectbe.dto.DepositResponseDTO;
+import com.example.miniprojectbe.dto.SearchListRequestDTO;
+import com.example.miniprojectbe.dto.LoanResponseDTO;
+import com.example.miniprojectbe.service.SearchListService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Slice;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@CrossOrigin(origins = "*")
+public class SearchListController {
+
+    private final SearchListService searchListService;
+
+    @GetMapping("/deposit_list")
+    public Slice<DepositResponseDTO> depositList(@RequestParam int page){
+        SearchListRequestDTO input = new SearchListRequestDTO();
+        input.setCategory("정기예금");
+        return searchListService.pagingByDeposit(input.getCategory(), page);
+    }
+    @GetMapping("/savings_list")
+    public Slice<DepositResponseDTO> savingsList(@RequestParam int page){
+        SearchListRequestDTO input = new SearchListRequestDTO();
+        input.setCategory("적금");
+        return searchListService.pagingByDeposit(input.getCategory(), page);
+    }
+    @GetMapping("/mortgage_loan")
+    public Slice<LoanResponseDTO> mortgageLoan(@RequestParam int page){
+        SearchListRequestDTO input = new SearchListRequestDTO();
+        input.setCategory("주택담보대출");
+        return searchListService.pagingByLoan(input.getCategory(),page);
+    }
+    @GetMapping("/charter_loan")
+    public Slice<LoanResponseDTO> charterLoan(@RequestParam int page){
+        SearchListRequestDTO input = new SearchListRequestDTO();
+        input.setCategory("전세자금대출");
+        return searchListService.pagingByLoan(input.getCategory(),page);
+    }
+}

src/main/java/com/example/miniprojectbe/controller/SelectDetailController.java

@@ -0,0 +1,33 @@
+package com.example.miniprojectbe.controller;
+
+import com.example.miniprojectbe.dto.DepositDetailDTO;
+import com.example.miniprojectbe.dto.LoanDetailDTO;
+import com.example.miniprojectbe.service.impl.SelectDetailServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@CrossOrigin(origins = "*")
+public class SelectDetailController {
+
+    private final SelectDetailServiceImpl selectDetailService;
+
+    @GetMapping("/search/deposit/detail/{itemId}")
+    public DepositDetailDTO searchDeposit(@PathVariable Long itemId){
+
+        return selectDetailService.selectDetailDeposit(itemId);
+    }
+
+    @GetMapping("/search/loan/detail/{itemId}")
+    public LoanDetailDTO searchLoan(@PathVariable Long itemId){
+
+        return selectDetailService.selectDetailLoan(itemId);
+    }
+}

src/main/java/com/example/miniprojectbe/dto/BasketId.java

@@ -0,0 +1,17 @@
+package com.example.miniprojectbe.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@EqualsAndHashCode
+public class BasketId implements Serializable {
+
+    private String member;
+    private Long item;
+}