Finish Auction system

coalingot · Feb 8, 2022 · c8df854 · c8df854
1 parent b94405e
commit c8df854
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 2 deletions.
diff --git a/src/main/java/se/project/coalingot/auction/dto/AuctionHistoryDto.java b/src/main/java/se/project/coalingot/auction/dto/AuctionHistoryDto.java
@@ -5,6 +5,9 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import se.project.coalingot.auctionuser.dto.AuctionUserPaticipantDto;
+import se.project.coalingot.item.dto.ItemAuctionDto;
+import se.project.coalingot.item.dto.ItemDto;
+import se.project.coalingot.item.dto.ItemHistoryDto;
 
 import java.util.Date;
 
@@ -16,5 +19,5 @@ public class AuctionHistoryDto {
     AuctionUserPaticipantDto auctionUser;
     Double submitPrice;
     Date submitAt;
-
+    ItemHistoryDto auctionItem;
 }
diff --git a/src/main/java/se/project/coalingot/auctionuser/dto/AuctionUserDto.java b/src/main/java/se/project/coalingot/auctionuser/dto/AuctionUserDto.java
@@ -5,6 +5,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import se.project.coalingot.auction.dto.AuctionHistoryDto;
 import se.project.coalingot.auction.entity.AuctionHistory;
 import se.project.coalingot.item.dto.ItemDto;
 
@@ -21,5 +22,5 @@ public class AuctionUserDto {
     String firstname;
     String lastname;
     List<ItemDto> own;
-    List<AuctionHistory> history;
+    List<AuctionHistoryDto> history;
 }
diff --git a/src/main/java/se/project/coalingot/item/dto/ItemDto.java b/src/main/java/se/project/coalingot/item/dto/ItemDto.java
@@ -16,4 +16,5 @@ public class ItemDto {
     String itemImage;
     String itemDescription;
     Double price;
+
 }
diff --git a/src/main/java/se/project/coalingot/item/dto/ItemHistoryDto.java b/src/main/java/se/project/coalingot/item/dto/ItemHistoryDto.java
@@ -0,0 +1,16 @@
+package se.project.coalingot.item.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ItemHistoryDto {
+    Long itemId;
+    String itemName;
+    String itemImage;
+}
diff --git a/src/main/java/se/project/coalingot/item/entity/Item.java b/src/main/java/se/project/coalingot/item/entity/Item.java
@@ -2,6 +2,7 @@
 
 import lombok.*;
 import se.project.coalingot.auction.entity.Auction;
+import se.project.coalingot.auction.entity.AuctionHistory;
 import se.project.coalingot.auctionuser.entity.AuctionUser;
 
 import javax.persistence.*;
@@ -28,4 +29,5 @@ public class Item {
 
     @OneToOne(mappedBy = "auctionItem")
     Auction auctionAt;
+
 }
diff --git a/src/main/java/se/project/coalingot/util/AuctionMapper.java b/src/main/java/se/project/coalingot/util/AuctionMapper.java
@@ -11,6 +11,7 @@
 import se.project.coalingot.auctionuser.entity.AuctionUser;
 import se.project.coalingot.item.dto.ItemAuctionDto;
 import se.project.coalingot.item.dto.ItemDto;
+import se.project.coalingot.item.dto.ItemHistoryDto;
 import se.project.coalingot.item.entity.Item;
 import se.project.coalingot.security.dto.UserAuthDto;
 import se.project.coalingot.security.entity.User;
@@ -31,6 +32,9 @@ public interface AuctionMapper {
     ItemAuctionDto getItemAuctionDto(Item item);
     List<ItemAuctionDto> getItemAuctionDto(List<Item> items);
 
+    ItemHistoryDto getItemHistoryDto(Item item);
+    List<ItemHistoryDto> getItemHistoryDto(List<Item> items);
+
     AuctionDto seeAuction(Auction auction);
     List<AuctionDto> seeAuction(List<Auction> auctions);