알림 기능 구현 & 키워드 검색 기능 구현

src/main/java/com/trade_ham/domain/auth/controller/UserController.java

@@ -0,0 +1,30 @@
+package com.trade_ham.domain.auth.controller;
+
+import com.trade_ham.domain.auth.dto.CustomOAuth2User;
+import com.trade_ham.domain.auth.dto.UserUpdateDTO;
+import com.trade_ham.domain.auth.service.UserService;
+import com.trade_ham.global.common.response.ApiResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@RequestMapping("/api/v1")
+public class UserController {
+
+    private final UserService userService;
+
+    @PostMapping("/user")
+    public ApiResponse<UserUpdateDTO> updateUser(@RequestBody UserUpdateDTO userUpdateDTO, @AuthenticationPrincipal CustomOAuth2User oAuth2User) {
+        Long sellerId = oAuth2User.getId();
+        // ID가 제대로 나오는지 확인
+        log.info("OAuth2 User ID: {}", oAuth2User.getId());
+
+        UserUpdateDTO userResponse = userService.updateUser(sellerId, userUpdateDTO);
+
+        return ApiResponse.success(userResponse);
+    }
+}

src/main/java/com/trade_ham/domain/auth/dto/UserUpdateDTO.java

@@ -0,0 +1,11 @@
+package com.trade_ham.domain.auth.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UserUpdateDTO {
+    private String account; // 계좌번호
+    private String realname;
+}

src/main/java/com/trade_ham/domain/auth/entity/UserEntity.java

@@ -36,10 +36,11 @@ public class UserEntity {
     private List<ProductEntity> purchasedProductEntities = new ArrayList<>();
 
     // 추후 따로 받는다.
-    private String acount; // 계좌번호
+    private String account; // 계좌번호
     private String realname; // 실제이름
 
-    public void updateNickname(String nickname) {
+    public void updateAccountAndNickname(String account, String nickname) {
+        this.account = account;
         this.nickname = nickname;
     }
 

src/main/java/com/trade_ham/domain/auth/service/UserService.java

@@ -0,0 +1,30 @@
+package com.trade_ham.domain.auth.service;
+
+import com.trade_ham.domain.auth.dto.UserUpdateDTO;
+import com.trade_ham.domain.auth.entity.UserEntity;
+import com.trade_ham.domain.auth.repository.UserRepository;
+import com.trade_ham.global.common.exception.ErrorCode;
+import com.trade_ham.global.common.exception.ResourceNotFoundException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class UserService {
+
+    private final UserRepository userRepository;
+
+    public UserUpdateDTO updateUser(Long sellerId, UserUpdateDTO userUpdateDTO) {
+        UserEntity userEntity = userRepository.findById(sellerId)
+                .orElseThrow(() -> new ResourceNotFoundException(ErrorCode.USER_NOT_FOUND));
+
+        userEntity.setAccount(userUpdateDTO.getAccount());
+        userEntity.setNickname(userUpdateDTO.getRealname());
+
+        userRepository.save(userEntity);
+
+        return userUpdateDTO;
+    }
+}

src/main/java/com/trade_ham/domain/locker/controller/NotificationController.java

@@ -0,0 +1,29 @@
+package com.trade_ham.domain.locker.controller;
+
+import com.trade_ham.domain.auth.dto.CustomOAuth2User;
+import com.trade_ham.domain.locker.entity.NotificationEntity;
+import com.trade_ham.domain.locker.service.NotificationService;
+import com.trade_ham.global.common.response.ApiResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/notification")
+public class NotificationController {
+
+    private final NotificationService notificationService;
+
+    @GetMapping()
+    public ApiResponse<List<NotificationEntity>> allNotification(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
+        Long userId = oAuth2User.getId();
+
+        List<NotificationEntity> notifications = notificationService.allNotification(userId);
+        return ApiResponse.success(notifications);
+    }
+}

src/main/java/com/trade_ham/domain/locker/dto/NotificationBuyerDTO.java

@@ -0,0 +1,16 @@
+package com.trade_ham.domain.locker.dto;
+
+import com.trade_ham.domain.auth.entity.UserEntity;
+import jakarta.persistence.Column;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class NotificationBuyerDTO {
+    private String message;
+    private String sellerAccount;
+    private String sellerRealname;
+    private boolean isRead;
+    private UserEntity userId;
+}

src/main/java/com/trade_ham/domain/locker/dto/NotificationLockerDTO.java

@@ -0,0 +1,15 @@
+package com.trade_ham.domain.locker.dto;
+
+import com.trade_ham.domain.auth.entity.UserEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class NotificationLockerDTO {
+    private String message;
+    private Long lockerId;
+    private String lockerPassword;
+    private boolean isRead;
+    private UserEntity userId;
+}

src/main/java/com/trade_ham/domain/locker/entity/NotificationEntity.java

@@ -0,0 +1,60 @@
+package com.trade_ham.domain.locker.entity;
+
+import com.trade_ham.domain.auth.entity.UserEntity;
+import com.trade_ham.domain.locker.dto.NotificationBuyerDTO;
+import com.trade_ham.domain.locker.dto.NotificationLockerDTO;
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Getter
+public class NotificationEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "notification_id")
+    private Long id;
+
+    //seller
+    @Column(name = "locker_id")
+    private Long lockerId;
+
+    @Column(name = "locker_password")
+    private String lockerPassword;
+
+    //buyer
+    @Column(name = "seller_account")
+    private String sellerAccount;
+
+    @Column(name = "seller_realname")
+    private String sellerRealname;
+
+    // common
+    private String message;
+
+    @Setter
+    private boolean isRead;
+
+    @ManyToOne
+    @Column(name = "user_id")
+    private UserEntity userId;
+
+    // 판매자 전용 알림
+    public NotificationEntity(NotificationLockerDTO notificationLockerDTO) {
+        this.message = notificationLockerDTO.getMessage();
+        this.lockerId = notificationLockerDTO.getLockerId();
+        this.lockerPassword = notificationLockerDTO.getLockerPassword();
+        this.isRead = notificationLockerDTO.isRead();
+        this.userId = notificationLockerDTO.getUserId();
+    }
+
+    // 구매자 전용 알림
+    public NotificationEntity(NotificationBuyerDTO NotificationBuyerDTO) {
+        this.message = NotificationBuyerDTO.getMessage();
+        this.sellerAccount = NotificationBuyerDTO.getSellerAccount();
+        this.sellerRealname = NotificationBuyerDTO.getSellerRealname();
+        this.isRead = NotificationBuyerDTO.isRead();
+        this.userId = NotificationBuyerDTO.getUserId();
+    }
+}

src/main/java/com/trade_ham/domain/locker/repository/NotificationRepository.java

@@ -0,0 +1,13 @@
+package com.trade_ham.domain.locker.repository;
+
+import com.trade_ham.domain.auth.entity.UserEntity;
+import com.trade_ham.domain.locker.dto.NotificationResponseDTO;
+import com.trade_ham.domain.locker.entity.NotificationEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface NotificationRepository extends JpaRepository<NotificationEntity, Long> {
+    List<NotificationEntity> findByUserIdAndIsReadTrue(Long userId);
+}

src/main/java/com/trade_ham/domain/locker/service/NotificationService.java

@@ -0,0 +1,28 @@
+package com.trade_ham.domain.locker.service;
+
+import com.trade_ham.domain.locker.dto.NotificationResponseDTO;
+import com.trade_ham.domain.locker.entity.NotificationEntity;
+import com.trade_ham.domain.locker.repository.NotificationRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class NotificationService {
+
+    private final NotificationRepository notificationRepository;
+
+    @Transactional
+    public List<NotificationEntity> allNotification(Long userId) {
+        List<NotificationEntity> notifications = notificationRepository.findByUserIdAndIsReadTrue(userId);
+
+        for(NotificationEntity notificationEntity : notifications) {
+            notificationEntity.setRead(false);
+        }
+
+        return notificationRepository.saveAll(notifications);
+    }
+}

src/main/java/com/trade_ham/domain/product/controller/PurchaseProductController.java

@@ -1,12 +1,14 @@
 package com.trade_ham.domain.product.controller;
 
+import com.trade_ham.domain.auth.dto.CustomOAuth2User;
 import com.trade_ham.domain.product.entity.ProductEntity;
 import com.trade_ham.domain.product.entity.ProductStatus;
 import com.trade_ham.domain.product.service.PurchaseProductService;
 import com.trade_ham.global.common.exception.AccessDeniedException;
 import com.trade_ham.global.common.exception.ErrorCode;
 import com.trade_ham.global.common.response.ApiResponse;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -17,15 +19,16 @@ public class PurchaseProductController {
     private final PurchaseProductService productService;
 
     @GetMapping("/product/purchase-page/{productId}")
-    public ApiResponse<String> accessPurchasePage(@PathVariable Long productId) {
+    public ApiResponse<String> accessPurchasePage(@PathVariable Long productId, @AuthenticationPrincipal CustomOAuth2User oAuth2User) {
+        Long buyerId = oAuth2User.getId();
         ProductEntity productEntity = productService.findProductById(productId);
 
         // 상태가 SELL이 아니라면 예외 발생
         if (!productEntity.getStatus().equals(ProductStatus.SELL)) {
             throw new AccessDeniedException(ErrorCode.ACCESS_DENIED);
         }
 
-        productService.purchaseProduct(productId);
+        productService.purchaseProduct(productId, buyerId);
 
         // 상태가 SELL이면 구매 페이지에 접근 가능
         return ApiResponse.success("구매 페이지에 접근 가능합니다.");

src/main/java/com/trade_ham/domain/product/controller/SearchProductController.java

@@ -0,0 +1,27 @@
+package com.trade_ham.domain.product.controller;
+
+import com.trade_ham.domain.product.entity.ProductEntity;
+import com.trade_ham.domain.product.service.SearchProductService;
+import com.trade_ham.global.common.response.ApiResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1")
+public class SearchProductController {
+
+    private final SearchProductService searchProductService;
+
+    @GetMapping("/search")
+    public ApiResponse<List<ProductEntity>> searchSellProduct(@RequestParam String keyword) {
+        List<ProductEntity> productEntities = searchProductService.searchSellProduct(keyword);
+
+        return ApiResponse.success(productEntities);
+    }
+}

src/main/java/com/trade_ham/domain/product/entity/AlbumEntity.java

@@ -7,9 +7,11 @@ public class AlbumEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long albumId;
+
     @ManyToOne
     @JoinColumn(name = "product_id")
     private ProductEntity productEntity;
+
     private String imageUrl;
     private Double fileSize;
 

src/main/java/com/trade_ham/domain/product/entity/ProductEntity.java

@@ -2,6 +2,7 @@
 
 import com.trade_ham.domain.auth.entity.UserEntity;
 import com.trade_ham.domain.locker.entity.LockerEntity;
+import com.trade_ham.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 
@@ -10,10 +11,11 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class ProductEntity {
+public class ProductEntity extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long productId;
+
     @ManyToOne
     @JoinColumn(name = "seller_id")
     private UserEntity seller;

src/main/java/com/trade_ham/domain/product/repository/ProductRepository.java

@@ -18,6 +18,8 @@ public interface ProductRepository extends JpaRepository<ProductEntity, Long> {
     List<ProductEntity> findBySeller(UserEntity seller);
     List<ProductEntity> findByBuyer(UserEntity buyer);
     List<ProductEntity> findByStatusOrderByCreatedAtDesc(ProductStatus status);
+    @Query("SELECT p FROM ProductEntity p WHERE p.status = ProductStatus.SELL AND p.name LIKE %:keyword%")
+    List<ProductEntity> findByKeywordContainingAndStatusIsSell(@Param("keyword") String keyword);
 
     @Lock(LockModeType.PESSIMISTIC_WRITE)
     @Query("SELECT p FROM ProductEntity p WHERE p.productId = :productId")

src/main/java/com/trade_ham/domain/product/repository/TradeRepository.java

@@ -3,4 +3,8 @@
 import com.trade_ham.domain.product.entity.TradeEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface TradeRepository extends JpaRepository<TradeEntity, Long> {}
+import java.util.Optional;
+
+public interface TradeRepository extends JpaRepository<TradeEntity, Long> {
+    Optional<TradeEntity> findByProductEntityId(Long productId);
+}