Merge pull request #18 from coalingot/development

Development
coalingot · Feb 8, 2022 · b94405e · b94405e
2 parents a31ae85 + 592d9b3
commit b94405e
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 18 deletions.
diff --git a/src/main/java/se/project/coalingot/auction/dto/AuctionDto.java b/src/main/java/se/project/coalingot/auction/dto/AuctionDto.java
@@ -4,7 +4,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import se.project.coalingot.item.dto.ItemDto;
+import se.project.coalingot.item.dto.ItemAuctionDto;
 
 import java.util.Date;
 import java.util.List;
@@ -15,7 +15,7 @@
 @NoArgsConstructor
 public class AuctionDto {
     Long auctionId;
-    ItemDto auctionItem;
+    ItemAuctionDto auctionItem;
     Double highestPrice;
     Boolean status;
     Date startDate;

diff --git a/src/main/java/se/project/coalingot/config/InitApp.java b/src/main/java/se/project/coalingot/config/InitApp.java
@@ -95,8 +95,10 @@ public void addAuction() {
                 .startDate(Timestamp.valueOf(LocalDateTime.now()))
                 .endDate(Timestamp.valueOf(LocalDateTime.now()))
                 .highestPrice(1.50)
-                .status(true)
+                .status(false)
                 .build();
+        items[0].setOwnBy(newUser);
+        itemRepository.save(items[0]);
         auctionRepository.save(auc1);
 
 

diff --git a/src/main/java/se/project/coalingot/item/dao/ItemDaoImpl.java b/src/main/java/se/project/coalingot/item/dao/ItemDaoImpl.java
@@ -39,7 +39,7 @@ public Item postItem(ItemRequest itemRequest) {
         Auction auction = Auction.builder()
                 .auctionItem(item)
                 .startDate(Timestamp.valueOf(LocalDateTime.now()))
-                .endDate(Timestamp.valueOf(LocalDateTime.now()))
+                .endDate(itemRequest.getEndDate())
                 .highestPrice(itemRequest.getStartPrice())
                 .status(true)
                 .build();
@@ -58,7 +58,7 @@ public Item endAuction(Long id) {
         Auction auction = auctionRepository.findById(id).orElse(null);
         List<AuctionHistory> histories = auction.getHistories();
         Item item = auction.getAuctionItem();
-        AuctionUser auctionUser = new AuctionUser();
+        AuctionUser auctionUser = histories.get(0).getAuctionUser();
 
         double maxPrice = histories.get(0).getSubmitPrice();
         for(int i=1;i<histories.size();i++) {

diff --git a/src/main/java/se/project/coalingot/item/dto/ItemAuctionDto.java b/src/main/java/se/project/coalingot/item/dto/ItemAuctionDto.java
@@ -0,0 +1,17 @@
+package se.project.coalingot.item.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ItemAuctionDto {
+    Long itemId;
+    String itemName;
+    String itemImage;
+    String itemDescription;
+}
diff --git a/src/main/java/se/project/coalingot/security/controller/AuthenticationRestController.java b/src/main/java/se/project/coalingot/security/controller/AuthenticationRestController.java
@@ -16,6 +16,8 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.web.bind.annotation.*;
+import se.project.coalingot.auctionuser.entity.AuctionUser;
+import se.project.coalingot.auctionuser.repository.AuctionUserRepository;
 import se.project.coalingot.security.JwtTokenUtil;
 import se.project.coalingot.security.entity.Authority;
 import se.project.coalingot.security.entity.AuthorityName;
@@ -48,6 +50,9 @@ public class AuthenticationRestController {
     @Autowired
     UserRepository userRepository;
 
+    @Autowired
+    AuctionUserRepository auctionUserRepository;
+
     @Autowired
     AuthorityRepository authorityRepository;
 
@@ -99,19 +104,14 @@ public ResponseEntity<?> registerAuthentication(@RequestBody JwtAuthenticationRe
         authorityRepository.save(authUser);
         PasswordEncoder encoder = new BCryptPasswordEncoder();
         if (userRepository.findByUsername(authenticationRequest.getUsername()) == null ){
-            User newUser = User.builder()
-                    .username(authenticationRequest.getUsername())
-                    .password(encoder.encode(authenticationRequest.getPassword()))
-                    .firstname(authenticationRequest.getFirstname())
-                    .lastname(authenticationRequest.getLastname())
-                    .email(authenticationRequest.getEmail())
-                    .enabled(true)
-                    .build();
-
-            newUser.getAuthorities().add(authUser);
-
-            userRepository.save(newUser);
-
+            AuctionUser newUser = new AuctionUser();
+            newUser.setUsername(authenticationRequest.getUsername());
+            newUser.setPassword(encoder.encode(authenticationRequest.getPassword()));
+            newUser.setFirstname(authenticationRequest.getFirstname());
+            newUser.setLastname(authenticationRequest.getLastname());
+            newUser.setEmail(authenticationRequest.getEmail());
+            newUser.setEnabled(true);
+            auctionUserRepository.save(newUser);
             return ResponseEntity.ok("Registration successful");
         }else {
             return (ResponseEntity<?>) ResponseEntity.status(HttpStatus.BAD_GATEWAY);

diff --git a/src/main/java/se/project/coalingot/util/AuctionMapper.java b/src/main/java/se/project/coalingot/util/AuctionMapper.java
@@ -9,6 +9,7 @@
 import se.project.coalingot.auctionuser.dto.AuctionUserDto;
 import se.project.coalingot.auctionuser.dto.AuctionUserPaticipantDto;
 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.entity.Item;
 import se.project.coalingot.security.dto.UserAuthDto;
@@ -27,6 +28,9 @@ public interface AuctionMapper {
     ItemDto getItemDto(Item item);
     List<ItemDto> getItemDto(List<Item> items);
 
+    ItemAuctionDto getItemAuctionDto(Item item);
+    List<ItemAuctionDto> getItemAuctionDto(List<Item> items);
+
     AuctionDto seeAuction(Auction auction);
     List<AuctionDto> seeAuction(List<Auction> auctions);