commit

src/main/java/com/example/afrishop_v3/controllers/BonusController.java

@@ -18,14 +18,14 @@ import java.util.*;
 @RequestMapping("/discover/bonus")
 public class BonusController extends Controller {
     private final BonusRepository repository;
-    private final ItemRepository itemRepository;
+    private final TbCfStationItemRepository itemRepository;
     private final UserRepository userRepository;
     private final PostRepository postRepository;
     private final NetworkRepository networkRepository;
     private final EntityManager entityManager;
     private final AuthenticationUser user;
 
-    public BonusController(BonusRepository repository, ItemRepository itemRepository, UserRepository userRepository, PostRepository postRepository, NetworkRepository networkRepository, EntityManager entityManager, AuthenticationUser user) {
+    public BonusController(BonusRepository repository, TbCfStationItemRepository itemRepository, UserRepository userRepository, PostRepository postRepository, NetworkRepository networkRepository, EntityManager entityManager, AuthenticationUser user) {
         this.repository = repository;
         this.itemRepository = itemRepository;
         this.userRepository = userRepository;
@@ -35,18 +35,33 @@ public class BonusController extends Controller {
         this.user = user;
     }
 
+    @Deprecated
     @GetMapping(value = "/listBonus")
     //@PreAuthorize("hasAuthority('ADMIN_USER') or hasAuthority('STANDARD_USER')")
     public List<Bonus> getList(@RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
         return repository.findAll(PageRequest.of(pageNo, pageSize)).toList();
     }
 
+    @Deprecated
     @GetMapping(value = "/list/bonus/{userId}")
     //@PreAuthorize("hasAuthority('ADMIN_USER') or hasAuthority('STANDARD_USER')")
     public List<Bonus> getListByUser(@PathVariable("userId") String id, @RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
         return repository.findAllByUserInfo_UserIdOrderByIdDesc(id, PageRequest.of(pageNo, pageSize)).toList();
     }
 
+    @GetMapping(value = "/list")
+    //@PreAuthorize("hasAuthority('ADMIN_USER') or hasAuthority('STANDARD_USER')")
+    public List<Bonus> getListByUser(@RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
+        return repository.findAllByUserInfo_UserIdOrderByIdDesc(user.userId(), PageRequest.of(pageNo, pageSize)).toList();
+    }
+
+    @GetMapping(value = "/list/currentMonth")
+    //@PreAuthorize("hasAuthority('ADMIN_USER') or hasAuthority('STANDARD_USER')")
+    public Map<String, Object> getListByUserAndCurrentMonth( @RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
+        return getListByUserAndCurrentMonth(user.userId(),pageNo,pageSize);
+    }
+
+    @Deprecated
     @GetMapping(value = "/list/bonus/{userId}/currentMonth")
     //@PreAuthorize("hasAuthority('ADMIN_USER') or hasAuthority('STANDARD_USER')")
     public Map<String, Object> getListByUserAndCurrentMonth(@PathVariable("userId") String id, @RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
@@ -67,6 +82,13 @@ public class BonusController extends Controller {
         return hashMap;
     }
 
+    @GetMapping(value = "/list/prevMonth")
+    //@PreAuthorize("hasAuthority('ADMIN_USER') or hasAuthority('STANDARD_USER')")
+    public Map<String, Object> getListByUserAndPreviousMonth(@RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
+        return getListByUserAndPreviousMonth(user.userId(),pageNo,pageSize);
+    }
+
+    @Deprecated
     @GetMapping(value = "/list/bonus/{userId}/prevMonth")
     //@PreAuthorize("hasAuthority('ADMIN_USER') or hasAuthority('STANDARD_USER')")
     public Map<String, Object> getListByUserAndPreviousMonth(@PathVariable("userId") String id, @RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
@@ -87,6 +109,13 @@ public class BonusController extends Controller {
         return hashMap;
     }
 
+    @GetMapping(value = "/list/today")
+    //@PreAuthorize("hasAuthority('ADMIN_USER') or hasAuthority('STANDARD_USER')")
+    public Map<String, Object> getListByUserAndToday(@RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
+        return getListByUserAndToday(user.userId(),pageNo,pageSize);
+    }
+
+    @Deprecated
     @GetMapping(value = "/list/bonus/{userId}/today")
     //@PreAuthorize("hasAuthority('ADMIN_USER') or hasAuthority('STANDARD_USER')")
     public Map<String, Object> getListByUserAndToday(@PathVariable("userId") String id, @RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
@@ -110,25 +139,23 @@ public class BonusController extends Controller {
     @PostMapping(value = "/saveBonus")
     public Bonus saveBonus(@ModelAttribute("Bonus") Bonus bonus) {
         String itemId = bonus.getProduct();
-        boolean exists = itemRepository.existsByItemName(itemId);
-        Item byItemName = itemRepository.findByItemName(itemId);
+        Optional<TbCfStationItem> itemOptional = itemRepository.findById(itemId);
         Post post = bonus.getPost();
-        if (exists) {
-            bonus.setItem(byItemName);
+        if (itemOptional.isPresent()) {
+            bonus.setStationItem(itemOptional.get());
         } else return null;
 
 
         String sharer = bonus.getSharer();
         double amount = bonus.getAmount();
         bonus.setAmount(amount * 5 / 100);
-        bonus.setItem(byItemName);
         bonus.setPercentage(5);
 
         if (sharer != null && userRepository.existsByCode(sharer)) {
             Optional<TbCfUserInfo> byId = userRepository.findByCode(sharer);
             if (byId.isPresent()) {
                 Bonus bonus1 = new Bonus();
-                bonus1.setItem(byItemName);
+                bonus1.setStationItem(itemOptional.get());
                 bonus1.setPost(post);
                 bonus1.setUserInfo(byId.get());
                 bonus1.setAmount(amount * 10 / 100);

src/main/java/com/example/afrishop_v3/models/Bonus.java

@@ -22,6 +22,9 @@ public class Bonus extends Model {
     @ManyToOne()
     private Item item;
 
+    @ManyToOne()
+    private TbCfStationItem stationItem;
+
     private double amount;
 
     private String orderId;
@@ -117,6 +120,10 @@ public class Bonus extends Model {
         this.item = item;
     }
 
+    public void setStationItem(TbCfStationItem stationItem) {
+        this.stationItem = stationItem;
+    }
+
     public Date getDate(){
         return createDate;
     }