Merge pull request #64 from TP-RENTPLACE/feature/return-sorted-images

feat: add images sorting for property.findById()

Author: Kattsyn

rentplace/src/main/java/kattsyn/dev/rentplace/dtos/properties/PropertyDTO.java

@@ -15,6 +15,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.util.List;
 import java.util.Set;
 
 @NoArgsConstructor
@@ -88,7 +89,7 @@ NOT PUBLISHED (не опубликовано) - объявление уже пр
     private UserDTO ownerDTO;
 
     @Schema(description = "Фотографии жилья")
-    private Set<ImageDTO> imagesDTOs;
+    private List<ImageDTO> imagesDTOs;
 
     @Schema(description = "Категории жилья")
     private Set<CategoryDTO> categoriesDTOs;

rentplace/src/main/java/kattsyn/dev/rentplace/services/impl/PropertyServiceImpl.java

@@ -27,6 +27,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 
@@ -102,7 +103,9 @@ public Property getPropertyById(long id) {
     @Transactional
     @Override
     public PropertyDTO findById(long id) {
-        return propertyMapper.fromProperty(getPropertyById(id));
+        PropertyDTO propertyDTO = propertyMapper.fromProperty(getPropertyById(id));
+        propertyDTO.getImagesDTOs().sort(Comparator.comparing(ImageDTO::isPreviewImage).reversed().thenComparing(ImageDTO::getImageId));
+        return propertyDTO;
     }