implemented and tested create loan endpoint

backend/src/main/java/ro/ubb/controller/AnnouncementController.java

@@ -14,11 +14,9 @@
 import ro.ubb.converter.DtoConverter;
 import ro.ubb.dto.*;
 import ro.ubb.model.*;
+import ro.ubb.model.enums.Status;
 import ro.ubb.security.JWTUtil;
-import ro.ubb.service.AnnouncementService;
-import ro.ubb.service.DiscussionService;
-import ro.ubb.service.ImageService;
-import ro.ubb.service.UserService;
+import ro.ubb.service.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
@@ -33,6 +31,7 @@ public class AnnouncementController {
   private AnnouncementService announcementService;
   private ImageService imageService;
   private DiscussionService discussionService;
+  private LoanService loanService;
   private DtoConverter dtoConverter;
   private UserService userService;
   private JWTUtil jwtUtil;
@@ -144,12 +143,14 @@ ResponseEntity<?> startDiscussion(@ModelAttribute LoanDto loanDto) {
     log.info("calling userService getById ...");
     User user = userService.getById(interestedUser);
     if (user == null) {
+      log.error("no user with id={}", interestedUser);
       return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
     }
     log.info("userService getById complete");
     log.info("calling announcementService getById ...");
     Announcement announcement = announcementService.getById(announcementId);
     if (announcement == null) {
+      log.error("no announcement with id={}", announcementId);
       return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
     log.info("announcementService getById complete");
@@ -158,6 +159,7 @@ ResponseEntity<?> startDiscussion(@ModelAttribute LoanDto loanDto) {
             .interestedUser(user)
             .discussedAnnouncement(announcement)
             .build();
+    announcement.setStatus(Status.IN_DISCUSSION);
     log.info("calling discussionService add ...");
     discussionService.add(discussion);
     log.info("discussionService add complete");
@@ -168,6 +170,61 @@ ResponseEntity<?> startDiscussion(@ModelAttribute LoanDto loanDto) {
     return ResponseEntity.ok().body(discussionResponseDto);
   }
 
+  @GetMapping(value = "/get-discussions/{announcementId}")
+  ResponseEntity<?> getDiscussions(@PathVariable int announcementId) {
+    log.info("userService getById complete");
+    log.info("calling announcementService getById ...");
+    Announcement announcement = announcementService.getById(announcementId);
+    if (announcement == null) {
+      log.error("no announcement with id={}", announcementId);
+      return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    }
+    log.info("announcementService getById complete");
+
+    log.info("calling discussionService getAllByAnnouncement ...");
+    List<Discussion> discussions = discussionService.getAllByAnnouncement(announcement);
+    log.info("discussionService getAllByAnnouncement complete");
+
+    return ResponseEntity.ok().body(discussions.toString());
+  }
+
+  @PostMapping(value = "/loan")
+  ResponseEntity<?> loan(@ModelAttribute LoanDto loanDto) {
+    int interestedUser = Integer.parseInt(jwtUtil.decodeJWT(loanDto.getInterestedTokenUser()).getId());
+    int announcementId = loanDto.getAnnouncementId();
+
+    log.info("calling userService getById ...");
+    User user = userService.getById(interestedUser);
+    if (user == null) {
+      log.error("no user with id={}", interestedUser);
+      return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    }
+    log.info("userService getById complete");
+    log.info("calling announcementService getById ...");
+    Announcement announcement = announcementService.getById(announcementId);
+    if (announcement == null) {
+      log.error("no announcement with id={}", announcementId);
+      return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    }
+    log.info("announcementService getById complete");
+    log.info("calling discussionService getByAnnouncementAndInterestedUser ...");
+    Discussion discussion = discussionService.getByAnnouncementAndInterestedUser(user, announcement);
+    if (discussion == null) {
+      log.error("no discussion with announcement={} and interestedUser={}", announcement, user);
+      return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    }
+    log.info("discussionService getByAnnouncementAndInterestedUser complete");
+
+    Loan loan = Loan.builder()
+            .discussion(discussion)
+            .build();
+    announcement.setStatus(Status.LOANED);
+    log.info("calling discussionService add ...");
+    loanService.add(loan);
+    log.info("discussionService add complete");
+    return ResponseEntity.ok().build();
+  }
+
   @Autowired
   public void setAnnouncementService(AnnouncementService announcementService) {
     this.announcementService = announcementService;
@@ -183,6 +240,11 @@ public void setDiscussionService(DiscussionService discussionService) {
     this.discussionService = discussionService;
   }
 
+  @Autowired
+  public void setLoanService(LoanService loanService) {
+    this.loanService = loanService;
+  }
+
   @Autowired
   public void setDtoConverter(DtoConverter dtoConverter) {
     this.dtoConverter = dtoConverter;

backend/src/main/java/ro/ubb/repository/DiscussionRepository.java

@@ -1,7 +1,18 @@
 package ro.ubb.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import ro.ubb.model.Announcement;
 import ro.ubb.model.Discussion;
 
+import java.util.List;
+
 public interface DiscussionRepository extends JpaRepository<Discussion, Integer> {
+
+    @Query("select d from Discussion d where d.interestedUser = :interestedUserId and d.discussedAnnouncement = :announcement")
+    Discussion getByAnnouncementAndInterestedUser(@Param("interested_user_id") int interestedUserId, @Param("announcement_id") int announcement);
+
+    @Query("select d from Discussion d where d.discussedAnnouncement = :announcement")
+    List<Discussion> getAllByAnnouncement(Announcement announcement);
 }

backend/src/main/java/ro/ubb/service/DiscussionService.java

@@ -1,8 +1,16 @@
 package ro.ubb.service;
 
+import ro.ubb.model.Announcement;
 import ro.ubb.model.Discussion;
+import ro.ubb.model.User;
+
+import java.util.List;
 
 public interface DiscussionService {
 
     Discussion add(Discussion discussion);
+
+    Discussion getByAnnouncementAndInterestedUser(User user, Announcement announcement);
+
+    List<Discussion> getAllByAnnouncement(Announcement announcement);
 }

backend/src/main/java/ro/ubb/service/DiscussionServiceImpl.java

@@ -1,9 +1,13 @@
 package ro.ubb.service;
 
 import org.springframework.stereotype.Service;
+import ro.ubb.model.Announcement;
 import ro.ubb.model.Discussion;
+import ro.ubb.model.User;
 import ro.ubb.repository.DiscussionRepository;
 
+import java.util.List;
+
 @Service
 public class DiscussionServiceImpl implements DiscussionService{
 
@@ -13,4 +17,14 @@ public class DiscussionServiceImpl implements DiscussionService{
     public Discussion add(Discussion discussion) {
         return discussionRepository.save(discussion);
     }
+
+    @Override
+    public Discussion getByAnnouncementAndInterestedUser(User user, Announcement announcement) {
+        return discussionRepository.getByAnnouncementAndInterestedUser(user.getId(), announcement.getId());
+    }
+
+    @Override
+    public List<Discussion> getAllByAnnouncement(Announcement announcement) {
+        return discussionRepository.getAllByAnnouncement(announcement);
+    }
 }

backend/src/main/java/ro/ubb/service/LoanService.java

@@ -0,0 +1,8 @@
+package ro.ubb.service;
+
+import ro.ubb.model.Loan;
+
+public interface LoanService {
+
+    Loan add(Loan loan);
+}

backend/src/main/java/ro/ubb/service/LoanServiceImpl.java

@@ -0,0 +1,16 @@
+package ro.ubb.service;
+
+import org.springframework.stereotype.Service;
+import ro.ubb.model.Loan;
+import ro.ubb.repository.LoanRepository;
+
+@Service
+public class LoanServiceImpl implements LoanService {
+
+    private LoanRepository loanRepository;
+
+    @Override
+    public Loan add(Loan loan) {
+        return loanRepository.save(loan);
+    }
+}

backend/src/test/java/ro/ubb/controller/AnnouncementControllerTest.java

@@ -14,16 +14,16 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
 import ro.ubb.converter.DtoConverter;
-import ro.ubb.dto.*;
+import ro.ubb.dto.AnnouncementDto;
+import ro.ubb.dto.BytesAnnouncementDto;
+import ro.ubb.dto.OrderingAndFilteringDto;
+import ro.ubb.dto.PagedAnnouncementDto;
 import ro.ubb.model.*;
 import ro.ubb.model.enums.Category;
 import ro.ubb.model.enums.Order;
 import ro.ubb.model.enums.Status;
 import ro.ubb.security.JWTUtil;
-import ro.ubb.service.AnnouncementService;
-import ro.ubb.service.DiscussionService;
-import ro.ubb.service.ImageService;
-import ro.ubb.service.UserService;
+import ro.ubb.service.*;
 
 import java.sql.Date;
 import java.util.ArrayList;
@@ -50,6 +50,7 @@ class AnnouncementControllerTest {
   @MockBean private ImageService imageService;
   @MockBean private UserService userService;
   @MockBean private DiscussionService discussionService;
+  @MockBean private LoanService loanService;
   @MockBean private DtoConverter dtoConverter;
   @MockBean private JWTUtil jwtUtil;
 
@@ -524,4 +525,104 @@ void testStartDiscussion() throws Exception {
     verify(announcementService).getById(2);
     verify(discussionService).add(any(Discussion.class));
   }
+
+  @Test
+  void testStartDiscussion_notFound() throws Exception {
+    Claims claims = new DefaultClaims();
+    claims.setId("3");
+    given(jwtUtil.createJWT(any(Integer.class), any(Long.class))).willReturn("token");
+    given(jwtUtil.decodeJWT(any(String.class))).willReturn(claims);
+    given(userService.getById(any(Integer.class))).willReturn(User.builder().id(3).build());
+    given(announcementService.getById(any(Integer.class))).willReturn(null);
+
+    mockMvc.perform(
+            post("/api/announcement/discussion")
+                    .contentType(MediaType.MULTIPART_FORM_DATA)
+                    .param("interestedTokenUser", jwtUtil.createJWT(3, JWTUtil.DEFAULT_VALIDITY))
+                    .param("announcementId", "2"))
+            .andExpect(status().isNotFound());
+
+    verify(jwtUtil).decodeJWT(any(String.class));
+    verify(userService).getById(3);
+    verify(announcementService).getById(2);
+    verify(discussionService, never()).add(any(Discussion.class));
+  }
+
+  @Test
+  void testGetDiscussions() throws Exception {
+    given(announcementService.getById(1)).willReturn(Announcement.builder().id(2).user(User.builder().id(4).build()).build());
+
+    mockMvc.perform(
+            get("/api/announcement/get-discussions/1"))
+            .andExpect(status().isOk());
+
+    verify(announcementService).getById(1);
+    verify(discussionService).getAllByAnnouncement(any(Announcement.class));
+  }
+
+  @Test
+  void testGetDiscussions_notFound() throws Exception {
+    given(announcementService.getById(2)).willReturn(null);
+
+    mockMvc.perform(
+            get("/api/announcement/get-discussions/2"))
+            .andExpect(status().isNotFound());
+
+    verify(announcementService).getById(2);
+    verify(discussionService, never()).getAllByAnnouncement(any(Announcement.class));
+  }
+
+  @Test
+  void testLoan() throws Exception {
+    Claims claims = new DefaultClaims();
+    claims.setId("3");
+    given(jwtUtil.createJWT(any(Integer.class), any(Long.class))).willReturn("token");
+    given(jwtUtil.decodeJWT(any(String.class))).willReturn(claims);
+    given(userService.getById(any(Integer.class))).willReturn(User.builder().id(3).build());
+    given(announcementService.getById(any(Integer.class))).willReturn(Announcement.builder().id(2).user(User.builder().id(4).build()).build());
+    given(discussionService.getByAnnouncementAndInterestedUser(any(User.class), any(Announcement.class))).willReturn(Discussion.builder()
+            .discussedAnnouncement(Announcement.builder().id(2).user(User.builder().id(4).build()).build())
+            .interestedUser(User.builder().id(3).build())
+            .build());
+
+    mockMvc.perform(
+            post("/api/announcement/loan")
+                    .contentType(MediaType.MULTIPART_FORM_DATA)
+                    .param("interestedTokenUser", jwtUtil.createJWT(3, JWTUtil.DEFAULT_VALIDITY))
+                    .param("announcementId", "2"))
+            .andExpect(status().isOk());
+
+    verify(jwtUtil).decodeJWT(any(String.class));
+    verify(userService).getById(3);
+    verify(announcementService).getById(2);
+    verify(discussionService).getByAnnouncementAndInterestedUser(any(User.class), any(Announcement.class));
+    verify(loanService).add(any(Loan.class));
+  }
+
+  @Test
+  void testLoan_notFound() throws Exception {
+    Claims claims = new DefaultClaims();
+    claims.setId("3");
+    given(jwtUtil.createJWT(any(Integer.class), any(Long.class))).willReturn("token");
+    given(jwtUtil.decodeJWT(any(String.class))).willReturn(claims);
+    given(userService.getById(any(Integer.class))).willReturn(User.builder().id(3).build());
+    given(announcementService.getById(any(Integer.class))).willReturn(null);
+    given(discussionService.getByAnnouncementAndInterestedUser(any(User.class), any(Announcement.class))).willReturn(Discussion.builder()
+            .discussedAnnouncement(Announcement.builder().id(2).user(User.builder().id(4).build()).build())
+            .interestedUser(User.builder().id(3).build())
+            .build());
+
+    mockMvc.perform(
+            post("/api/announcement/loan")
+                    .contentType(MediaType.MULTIPART_FORM_DATA)
+                    .param("interestedTokenUser", jwtUtil.createJWT(3, JWTUtil.DEFAULT_VALIDITY))
+                    .param("announcementId", "2"))
+            .andExpect(status().isNotFound());
+
+    verify(jwtUtil).decodeJWT(any(String.class));
+    verify(userService).getById(3);
+    verify(announcementService).getById(2);
+    verify(discussionService, never()).getByAnnouncementAndInterestedUser(any(User.class), any(Announcement.class));
+    verify(loanService, never()).add(any(Loan.class));
+  }
 }