From 6c1670f6ca76f02a028f993fcd4dcfd00d417d39 Mon Sep 17 00:00:00 2001 From: LeeEunmi Date: Wed, 13 Aug 2025 16:10:09 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=F0=9F=90=9B=20fix:=20=EA=B3=84=EC=95=BD?= =?UTF-8?q?=EC=A0=84=20=EC=9E=91=EC=84=B1=20=ED=9B=84=20=EA=B3=BC=EC=A0=95?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ContractController.java | 6 ---- .../controller/ContractControllerImpl.java | 10 ------ .../contract/service/ContractService.java | 8 ----- .../contract/service/ContractServiceImpl.java | 31 ------------------- .../TenantPreContractControllerImpl.java | 4 +-- .../service/OwnerPreContractServiceImpl.java | 1 + ...ice.java => TenantPreContractService.java} | 2 +- ...java => TenantPreContractServiceImpl.java} | 2 +- 8 files changed, 5 insertions(+), 59 deletions(-) rename src/main/java/org/scoula/domain/precontract/service/{PreContractService.java => TenantPreContractService.java} (98%) rename src/main/java/org/scoula/domain/precontract/service/{PreContractServiceImpl.java => TenantPreContractServiceImpl.java} (99%) diff --git a/src/main/java/org/scoula/domain/contract/controller/ContractController.java b/src/main/java/org/scoula/domain/contract/controller/ContractController.java index 19d1623e..bd963a54 100644 --- a/src/main/java/org/scoula/domain/contract/controller/ContractController.java +++ b/src/main/java/org/scoula/domain/contract/controller/ContractController.java @@ -14,12 +14,6 @@ @Api(tags = "계약서 API", description = "계약서 : 정보확인 / 금액 조율 / 적법성 확인") public interface ContractController { - // step 0 - @ApiOperation(value = "임차인 대기 메세지", notes = "step0의 AI 메세지") - ResponseEntity> standByContract( - @PathVariable Long contractChatId, - @AuthenticationPrincipal CustomUserDetails userDetails); - // step 1 (init) @ApiOperation(value = "계약서 몽고DB에 저장", notes = "계약서에 필요한 항목들을 가져와서 몽고 DB에 계약서 만들기") ResponseEntity> saveContractMongo( diff --git a/src/main/java/org/scoula/domain/contract/controller/ContractControllerImpl.java b/src/main/java/org/scoula/domain/contract/controller/ContractControllerImpl.java index 08a667bf..e9ba5a1d 100644 --- a/src/main/java/org/scoula/domain/contract/controller/ContractControllerImpl.java +++ b/src/main/java/org/scoula/domain/contract/controller/ContractControllerImpl.java @@ -19,16 +19,6 @@ public class ContractControllerImpl implements ContractController { private final ContractService service; - @Override - @PostMapping("/standBy") - public ResponseEntity> standByContract( - @PathVariable Long contractChatId, - @AuthenticationPrincipal CustomUserDetails userDetails) { - return ResponseEntity.ok( - ApiResponse.success( - service.standByContract(contractChatId, userDetails.getUserId()))); - } - @Override @PostMapping("") public ResponseEntity> saveContractMongo( diff --git a/src/main/java/org/scoula/domain/contract/service/ContractService.java b/src/main/java/org/scoula/domain/contract/service/ContractService.java index a0380765..4dab7963 100644 --- a/src/main/java/org/scoula/domain/contract/service/ContractService.java +++ b/src/main/java/org/scoula/domain/contract/service/ContractService.java @@ -4,14 +4,6 @@ public interface ContractService { - /** - * step0. 임차인이 임대인을 기다릴때 - * - * @param contractChatId 채팅방 아이디 - * @param userId 유저 아이디 - */ - Void standByContract(Long contractChatId, Long userId); - /** * step1 (init) 계약서에 필요한 항목들을 가져와서 몽고 DB에 계약서 만들기 * diff --git a/src/main/java/org/scoula/domain/contract/service/ContractServiceImpl.java b/src/main/java/org/scoula/domain/contract/service/ContractServiceImpl.java index a72f2d1a..5883528d 100644 --- a/src/main/java/org/scoula/domain/contract/service/ContractServiceImpl.java +++ b/src/main/java/org/scoula/domain/contract/service/ContractServiceImpl.java @@ -47,37 +47,6 @@ public class ContractServiceImpl implements ContractService { @Value("${ai.server.url:http://localhost:8000}") private String aiServerUrl; - /** {@inheritDoc} */ - @Override - public Void standByContract(Long contractChatId, Long userId) { - - // 시작 메세지 보내기 - contractChatService.AiMessage(contractChatId, """ - 안녕하세요! - 임대인이 입장하면 바로 계약서 작성을 시작할게요. - """); - - // 2초 - // 잠깐의 텀 (2초) - try { - Thread.sleep(2000); - } catch (InterruptedException ie) { - Thread.currentThread().interrupt(); - log.warn("standByContract sleep interrupted", ie); - } - - - contractChatService.AiMessageBtn(contractChatId, """ - 기다리는 동안 - 어려운 법률 용어와 법률 팁을 알아볼까요? - """); - - // contract에 매퍼로 스텝 추가하기 - contractChatMapper.updateStatus(contractChatId, ContractChat.ContractStatus.STEP0); - - return null; - } - /** {@inheritDoc} */ @Override public Void saveContractMongo(Long contractChatId, Long userId) { diff --git a/src/main/java/org/scoula/domain/precontract/controller/TenantPreContractControllerImpl.java b/src/main/java/org/scoula/domain/precontract/controller/TenantPreContractControllerImpl.java index 1faf1bcd..957319b6 100644 --- a/src/main/java/org/scoula/domain/precontract/controller/TenantPreContractControllerImpl.java +++ b/src/main/java/org/scoula/domain/precontract/controller/TenantPreContractControllerImpl.java @@ -1,7 +1,7 @@ package org.scoula.domain.precontract.controller; import org.scoula.domain.precontract.dto.tenant.*; -import org.scoula.domain.precontract.service.PreContractService; +import org.scoula.domain.precontract.service.TenantPreContractService; import org.scoula.global.auth.dto.CustomUserDetails; import org.scoula.global.common.dto.ApiResponse; import org.springframework.http.ResponseEntity; @@ -17,7 +17,7 @@ @Log4j2 public class TenantPreContractControllerImpl implements TenantPreContractController { - private final PreContractService service; + private final TenantPreContractService service; // =============== 사기 위험도 확인 & 기본 세팅 ================== diff --git a/src/main/java/org/scoula/domain/precontract/service/OwnerPreContractServiceImpl.java b/src/main/java/org/scoula/domain/precontract/service/OwnerPreContractServiceImpl.java index 2e2ce728..ea9a5cb7 100644 --- a/src/main/java/org/scoula/domain/precontract/service/OwnerPreContractServiceImpl.java +++ b/src/main/java/org/scoula/domain/precontract/service/OwnerPreContractServiceImpl.java @@ -443,6 +443,7 @@ public Void saveMongoDB(Long contractChatId, Long userId) { contractChatService.AiMessage( contractChatId, "\uD83D\uDC4B 임대인께서 입장하셨습니다! \n" + "지금부터 계약을 진행하겠습니다."); contractService.saveContractMongo(contractChatId, userId); + contractChatMapper.updateStatus(contractChatId, ContractChat.ContractStatus.STEP0); return null; } diff --git a/src/main/java/org/scoula/domain/precontract/service/PreContractService.java b/src/main/java/org/scoula/domain/precontract/service/TenantPreContractService.java similarity index 98% rename from src/main/java/org/scoula/domain/precontract/service/PreContractService.java rename to src/main/java/org/scoula/domain/precontract/service/TenantPreContractService.java index 8183b328..72d32e28 100644 --- a/src/main/java/org/scoula/domain/precontract/service/PreContractService.java +++ b/src/main/java/org/scoula/domain/precontract/service/TenantPreContractService.java @@ -2,7 +2,7 @@ import org.scoula.domain.precontract.dto.tenant.*; -public interface PreContractService { +public interface TenantPreContractService { // =============== 사기 위험도 확인 & 기본 세팅 ================== diff --git a/src/main/java/org/scoula/domain/precontract/service/PreContractServiceImpl.java b/src/main/java/org/scoula/domain/precontract/service/TenantPreContractServiceImpl.java similarity index 99% rename from src/main/java/org/scoula/domain/precontract/service/PreContractServiceImpl.java rename to src/main/java/org/scoula/domain/precontract/service/TenantPreContractServiceImpl.java index 39b2e3fb..883a1afa 100644 --- a/src/main/java/org/scoula/domain/precontract/service/PreContractServiceImpl.java +++ b/src/main/java/org/scoula/domain/precontract/service/TenantPreContractServiceImpl.java @@ -27,7 +27,7 @@ @Service @RequiredArgsConstructor @Log4j2 -public class PreContractServiceImpl implements PreContractService { +public class TenantPreContractServiceImpl implements TenantPreContractService { private final TenantPreContractMapper tenantMapper; private final TenantMongoRepository mongoRepository; From 6bd1c7ba963c089f89ed5ef8ba929d64f5f71e5a Mon Sep 17 00:00:00 2001 From: LeeEunmi Date: Wed, 13 Aug 2025 16:13:38 +0900 Subject: [PATCH 2/7] =?UTF-8?q?name=EC=9D=84=20identity=20verification?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B0=80=EC=A0=B8=EC=98=A4=EB=8A=94?= =?UTF-8?q?=EA=B1=B8=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scoula/domain/contract/mapper/ContractMapper.xml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/resources/org/scoula/domain/contract/mapper/ContractMapper.xml b/src/main/resources/org/scoula/domain/contract/mapper/ContractMapper.xml index 65037f6b..c5f80e68 100644 --- a/src/main/resources/org/scoula/domain/contract/mapper/ContractMapper.xml +++ b/src/main/resources/org/scoula/domain/contract/mapper/ContractMapper.xml @@ -7,22 +7,18 @@ + SELECT owner_id + FROM contract_chat + WHERE contract_chat_id = #{contractChatId} + + + +