Feature/tr 04

build.gradle.kts

@@ -1,3 +1,5 @@
+import org.gradle.kotlin.dsl.testImplementation
+
 plugins {
     java
     id("org.springframework.boot") version "4.0.5"
@@ -34,6 +36,7 @@ dependencies {
     testImplementation("org.springframework.boot:spring-boot-starter-data-jpa-test")
     testImplementation("org.springframework.boot:spring-boot-starter-validation-test")
     testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
+    testImplementation ("org.springframework.boot:spring-boot-starter-test")
     testCompileOnly("org.projectlombok:lombok")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testAnnotationProcessor("org.projectlombok:lombok")

src/main/java/com/back/together02be/asset/controller/AssetController.java

@@ -1,10 +1,9 @@
 package com.back.together02be.asset.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequiredArgsConstructor

src/main/java/com/back/together02be/asset/enitity/UserAccount.java → src/main/java/com/back/together02be/asset/entity/UserAccount.java

@@ -1,4 +1,4 @@
-package com.back.together02be.asset.enitity;
+package com.back.together02be.asset.entity;
 
 import com.back.together02be.global.entity.BaseEntity;
 import com.back.together02be.users.entity.Users;
@@ -40,4 +40,11 @@ public void increaseTotalPurchase(Long amount) {
 		this.totalPurchase += amount;
 	}
 
+	public void addDeposit(Long amount) {
+		this.deposit += amount;  // 누적 합산
+	}
+
+	public void subtractTotalPurchase(Long amount) {
+		this.totalPurchase = Math.max(0L, this.totalPurchase - amount);
+	}
 }

src/main/java/com/back/together02be/asset/enitity/UserStock.java → src/main/java/com/back/together02be/asset/entity/UserStock.java

@@ -1,4 +1,4 @@
-package com.back.together02be.asset.enitity;
+package com.back.together02be.asset.entity;
 
 import com.back.together02be.global.entity.BaseEntity;
 import com.back.together02be.stock.entity.Stock;
@@ -48,4 +48,10 @@ public void updateOnBuy(Long buyQuantity, Long buyPrice) {
 		this.averagePrice = newTotalCost / this.quantity;
 	}
 
+	public void updateQuantity(Long newQuantity){
+		if(newQuantity<0){
+			throw new IllegalArgumentException("보유 수량은 0보다 작을 수 없습니다.");
+		}
+		this.quantity = newQuantity;
+	}
 }

src/main/java/com/back/together02be/asset/repository/UserAccountRepository.java

@@ -1,10 +1,9 @@
 package com.back.together02be.asset.repository;
 
-import java.util.Optional;
-
+import com.back.together02be.asset.entity.UserAccount;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.back.together02be.asset.enitity.UserAccount;
+import java.util.Optional;
 
 public interface UserAccountRepository extends JpaRepository<UserAccount, Long> {
 	Optional<UserAccount> findByUsersId(Long usersId);

src/main/java/com/back/together02be/asset/repository/UserStockRepository.java

@@ -1,11 +1,27 @@
 package com.back.together02be.asset.repository;
 
-import java.util.Optional;
-
+import com.back.together02be.asset.entity.UserStock;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
-import com.back.together02be.asset.enitity.UserStock;
+import java.util.Optional;
 
 public interface UserStockRepository extends JpaRepository<UserStock, Long> {
 	Optional<UserStock> findByUsersIdAndStockId(Long usersId, Long stockId);
+
+    // 더티 체킹을 사용하지 않으므로, 연산 후 영속성 컨텍스트를 비워줘야 최신 데이터가 반영됩니다.
+    @Modifying(clearAutomatically = true)
+    @Query("UPDATE UserStock u SET u.quantity = u.quantity - :sellQuantity " +
+            "WHERE u.users.id = :userId AND u.stock.id = :stockId AND u.quantity >= :sellQuantity")
+    int updateQuantity(@Param("userId") Long userId,
+                       @Param("stockId") Long stockId,
+                       @Param("sellQuantity") Long sellQuantity);
+    //delete도 동시성 제어를 위해 사용
+    @Modifying(clearAutomatically = true)
+    @Query("DELETE FROM UserStock u WHERE u.users.id = :userId AND u.stock.id = :stockId AND u.quantity = 0")
+    void deleteByUserAndStock(@Param("userId") Long userId, @Param("stockId") Long stockId);
+
+    //void delete(UserStock userStock);
 }

src/main/java/com/back/together02be/global/initData/BaseInitData.java

@@ -1,11 +1,8 @@
 package com.back.together02be.global.initData;
 
-import com.back.together02be.asset.enitity.UserAccount;
 import com.back.together02be.asset.repository.UserAccountRepository;
-import com.back.together02be.stock.entity.Stock;
+import com.back.together02be.asset.repository.UserStockRepository;
 import com.back.together02be.stock.repository.StockRepository;
-import com.back.together02be.users.dto.request.SignupReq;
-import com.back.together02be.users.entity.Users;
 import com.back.together02be.users.repository.UsersRepository;
 import com.back.together02be.users.service.UsersService;
 import lombok.RequiredArgsConstructor;
@@ -26,6 +23,7 @@ public class BaseInitData {
     private final UsersRepository usersRepository;
     private final StockRepository stockRepository;
     private final UserAccountRepository userAccountRepository;
+    private final UserStockRepository userStockRepository;
 
     @Autowired
     @Lazy
@@ -37,27 +35,11 @@ public class BaseInitData {
     public ApplicationRunner initData() {
         return args -> {
             self.work1();
-            self.work2();
         };
     }
 
     @Transactional
     public void work1() {
-        // 테스트용 시드 데이터 (H2 dev 환경 전용)
-        Users user = usersRepository.save(new Users("testuser", "password", "테스트유저"));
-        stockRepository.save(new Stock("005930", "삼성전자", "KOSPI"));
-        userAccountRepository.save(new UserAccount(user, 0L, 50_000_000L));
-    }
-
-    @Transactional
-    public void work2() {
-		if (usersService.count() > 0) {
-			return;
-		}
-
-        usersService.signup(new SignupReq("user1", "1234", "1234", "유저1"));
-        usersService.signup(new SignupReq("user2", "1234", "1234", "유저2"));
-        usersService.signup(new SignupReq("user3", "1234", "1234", "유저3"));
     }
 
 }

src/main/java/com/back/together02be/global/util/MarketTimeValidator.java

@@ -0,0 +1,25 @@
+package com.back.together02be.global.util;
+
+import java.time.DayOfWeek;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+
+public class MarketTimeValidator {
+
+    public static void validateMarketOpen() {
+        LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Seoul"));
+        DayOfWeek day = now.getDayOfWeek();
+        LocalTime time = now.toLocalTime();
+
+        // 주말 체크
+        if (day == DayOfWeek.SATURDAY || day == DayOfWeek.SUNDAY) {
+            throw new IllegalStateException("주말에는 거래할 수 없습니다.");
+        }
+
+        // 시간 체크 (09:00 ~ 15:30)
+        if (time.isBefore(LocalTime.of(9, 0)) || time.isAfter(LocalTime.of(15, 30))) {
+            throw new IllegalStateException("장 운영 시간(09:00 ~ 15:30) 외에는 거래가 불가능합니다.");
+        }
+    }
+}

src/main/java/com/back/together02be/infra/kis/ApprovalKeyService.java

@@ -1,16 +1,14 @@
 package com.back.together02be.infra.kis;
 
-import java.util.Map;
-
+import com.back.together02be.infra.kis.config.KisProperties;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestClient;
 
-import com.back.together02be.infra.kis.config.KisProperties;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import java.util.Map;
 
 @Slf4j
 @Service

src/main/java/com/back/together02be/infra/kis/KisWebSocketClient.java

@@ -1,16 +1,14 @@
 package com.back.together02be.infra.kis;
 
-import java.net.URI;
-
-import org.java_websocket.client.WebSocketClient;
-import org.java_websocket.handshake.ServerHandshake;
-import org.springframework.stereotype.Component;
-
 import com.back.together02be.infra.kis.config.KisProperties;
-
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.handshake.ServerHandshake;
+import org.springframework.stereotype.Component;
+
+import java.net.URI;
 
 @Slf4j
 @Component

src/main/java/com/back/together02be/infra/kis/KisWebSocketHandler.java

@@ -1,14 +1,12 @@
 package com.back.together02be.infra.kis;
 
-import org.java_websocket.WebSocket;
-import org.springframework.stereotype.Component;
-
 import com.back.together02be.infra.kis.constant.KisConstants;
 import com.back.together02be.stock.dto.RealtimeStockPrice;
 import com.back.together02be.stock.service.RealTimeStockPriceStore;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.java_websocket.WebSocket;
+import org.springframework.stereotype.Component;
 
 @Slf4j
 @Component

src/main/java/com/back/together02be/stock/client/KisPriceClient.java

@@ -3,7 +3,6 @@
 import com.back.together02be.stock.dto.KisPriceRes;
 import com.back.together02be.stock.dto.KisTokenRes;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestClient;

src/main/java/com/back/together02be/stock/dto/RealtimeStockPrice.java

@@ -3,6 +3,12 @@
 import lombok.Builder;
 import lombok.Getter;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+
 @Getter
 @Builder
 public class RealtimeStockPrice {
@@ -12,4 +18,18 @@ public class RealtimeStockPrice {
 	private String change;         // 전일 대비
 	private String changeRate;     // 전일 대비율
 	private String tradeTime;	   // 체결시간
+
+	// 10초 이상 지연시 예외처리
+	public boolean isStale(int limitSeconds) {
+		if (this.tradeTime == null) return true; // 데이터가 없으면 무조건 지연 간주
+
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HHmmss");
+		LocalTime tradeTime = LocalTime.parse(this.tradeTime, formatter);
+
+		LocalDateTime tradeDateTime = LocalDateTime.of(LocalDate.now(), tradeTime);
+		LocalDateTime now = LocalDateTime.now();
+
+		// 현재 시간과 체결 시간의 차이가 limitSeconds를 넘는지 확인
+		return ChronoUnit.SECONDS.between(tradeDateTime, now) > limitSeconds;
+	}
 }

src/main/java/com/back/together02be/stock/service/StockService.java

@@ -1,33 +1,28 @@
 package com.back.together02be.stock.service;
 
+import com.back.together02be.infra.kis.KisWebSocketClient;
 import com.back.together02be.stock.cache.StockPriceCache;
 import com.back.together02be.stock.client.KisPriceClient;
 import com.back.together02be.stock.dto.KisPriceRes;
+import com.back.together02be.stock.dto.RealtimeStockPrice;
 import com.back.together02be.stock.dto.StockListRes;
 import com.back.together02be.stock.entity.Stock;
 import com.back.together02be.stock.repository.StockRepository;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-import java.io.IOException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.springframework.stereotype.Service;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-import com.back.together02be.infra.kis.KisWebSocketClient;
-import com.back.together02be.stock.dto.RealtimeStockPrice;
-import com.back.together02be.stock.repository.StockRepository;
-
 import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 @Service
 @RequiredArgsConstructor

src/main/java/com/back/together02be/trade/controller/TradeController.java

@@ -3,19 +3,16 @@
 import com.back.together02be.global.apiRes.ApiRes;
 import com.back.together02be.trade.dto.BuyReq;
 import com.back.together02be.trade.dto.BuyRes;
+import com.back.together02be.trade.dto.request.TradeSellReq;
+import com.back.together02be.trade.dto.response.TradeSellRes;
 import com.back.together02be.trade.service.TradeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequiredArgsConstructor
@@ -40,4 +37,17 @@ public ResponseEntity<ApiRes<BuyRes>> buy(
         BuyRes response = tradeService.buy(userId, idempotencyKey, request);
         return ResponseEntity.ok(new ApiRes<>("매수가 완료되었습니다.", response));
     }
+
+    //주식 매도
+    @Operation(summary = "주식 매도", description = "실시간 현재가 기준으로 매도를 처리합니다. X-Idempotency-Key 헤더 필수.")
+    @PostMapping("/sell")
+    public ResponseEntity<ApiRes<TradeSellRes>> sell(
+            @Parameter(description = "중복 요청 방지용 UUID (버튼 클릭마다 새로 생성)", required = true)
+            @RequestHeader("X-Idempotency-Key") String idempotencyKey,
+            @RequestParam Long userId, // TODO: Security 적용 후 제거
+            @RequestBody @Valid TradeSellReq req
+    ){
+        TradeSellRes res = tradeService.sell(userId,idempotencyKey,req);
+        return ResponseEntity.ok(new ApiRes<>("매수가 완료되었습니다.", res));
+    }
 }

src/main/java/com/back/together02be/trade/dto/request/TradeSellReq.java

@@ -0,0 +1,11 @@
+package com.back.together02be.trade.dto.request;
+
+import jakarta.validation.constraints.Min;
+
+public record TradeSellReq(
+        Long userId,
+        Long stockId,
+        @Min(value = 1, message = "매도 수량은 최소 1개여야 합니다.")
+        Long quantity,
+        Long expectedPrice
+){ }

src/main/java/com/back/together02be/trade/dto/response/TradeSellRes.java

@@ -0,0 +1,11 @@
+package com.back.together02be.trade.dto.response;
+
+public record TradeSellRes(
+        Long tradeId,
+        String stockName,
+        Long quantity,
+        Long price,
+        Long amount,
+        Long remainingDeposit
+) {
+}