Merge branch 'staging' into pai_mai

src/main/java/com/izouma/nineth/repo/AuctionRecordRepo.java

@@ -26,6 +26,6 @@ public interface AuctionRecordRepo extends JpaRepository<AuctionRecord, Long>, J
             " SELECT m.*, ROW_NUMBER() OVER (PARTITION BY auction_id ORDER BY id DESC) AS rn" +
             "    FROM auction_record AS m where user_id = ?1 and auction_type = ?2" +
             ")" +
-            "SELECT * FROM ranked_messages WHERE rn = 1;")
-    List<AuctionRecord> findByUserId(Long userId, AuctionType type);
+            " SELECT * FROM ranked_messages WHERE rn = 1;")
+    List<AuctionRecord> findByUserId(Long userId, String type);
 }

src/main/java/com/izouma/nineth/security/WebSecurityConfig.java

@@ -124,6 +124,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/order/calcSettle").permitAll()
                 .antMatchers("/auctionOrder/all").permitAll()
                 .antMatchers("/auctionOrder/get/**").permitAll()
+                .antMatchers("/auctionActivity/all").permitAll()
+                .antMatchers("/auctionActivity/get/**").permitAll()
                 .antMatchers("/ossNotify").permitAll()
                 .antMatchers("/priceList/list").permitAll()
                 .antMatchers("/user/collectionInvitorList").permitAll()

src/main/java/com/izouma/nineth/service/AuctionRecordService.java

@@ -98,7 +98,7 @@ public class AuctionRecordService {
         return new PageImpl<>(auctionRecordDTOS, records.getPageable(), records.getTotalElements());
     }
 
-    public List<AuctionRecordDTO> userRecord(Long userId, AuctionType type) {
+    public List<AuctionRecordDTO> userRecord(Long userId, String type) {
         List<AuctionRecord> records = auctionRecordRepo.findByUserId(userId, type);
         List<AuctionRecordDTO> auctionRecordDTOS = new ArrayList<>();
         records.forEach(record -> {

src/main/java/com/izouma/nineth/web/AuctionRecordController.java

@@ -2,7 +2,6 @@ package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.AuctionRecord;
 import com.izouma.nineth.dto.auction.AuctionRecordDTO;
-import com.izouma.nineth.enums.AuctionType;
 import com.izouma.nineth.service.AuctionRecordService;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
@@ -50,7 +49,7 @@ public class AuctionRecordController extends BaseController {
     }
 
     @PostMapping("/userRecord")
-    public List<AuctionRecordDTO> userRecord(@RequestParam AuctionType type) {
+    public List<AuctionRecordDTO> userRecord(@RequestParam String type) {
         return auctionRecordService.userRecord(SecurityUtils.getAuthenticatedUser().getId(), type);
     }
 

src/test/java/com/izouma/nineth/repo/AuctionRecordRepoTest.java

@@ -0,0 +1,18 @@
+package com.izouma.nineth.repo;
+
+
+import com.izouma.nineth.ApplicationTests;
+import com.izouma.nineth.enums.AuctionType;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class AuctionRecordRepoTest extends ApplicationTests {
+    @Autowired
+    private AuctionRecordRepo auctionRecordRepo;
+
+    @Test
+    public void test() {
+        auctionRecordRepo.findByUserId(9972L, AuctionType.NFT.toString());
+    }
+
+}