From 3890bc4398b2359e22601f1a94a47e230a8046fd Mon Sep 17 00:00:00 2001 From: Angelo Padron Date: Sun, 24 Nov 2024 18:09:26 -0300 Subject: [PATCH] remove duplicated dto and other minor tweaks --- .../org/meliapp/backend/controller/AdminController.kt | 3 +-- .../backend/dto/management/BookmarkBasicResume.kt | 10 ---------- .../meliapp/backend/dto/management/UserBasicResume.kt | 1 + .../meliapp/backend/repository/BookmarkRepository.kt | 5 ++--- .../org/meliapp/backend/repository/UserRepository.kt | 2 +- .../kotlin/org/meliapp/backend/service/AdminService.kt | 3 +-- 6 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 src/main/kotlin/org/meliapp/backend/dto/management/BookmarkBasicResume.kt diff --git a/src/main/kotlin/org/meliapp/backend/controller/AdminController.kt b/src/main/kotlin/org/meliapp/backend/controller/AdminController.kt index a9334dc..eda9724 100644 --- a/src/main/kotlin/org/meliapp/backend/controller/AdminController.kt +++ b/src/main/kotlin/org/meliapp/backend/controller/AdminController.kt @@ -1,7 +1,6 @@ package org.meliapp.backend.controller import org.meliapp.backend.dto.ApiResponse -import org.meliapp.backend.dto.management.BookmarkBasicResume import org.meliapp.backend.dto.management.UserBasicResume import org.meliapp.backend.dto.management.top.ProductBookmarkCount import org.meliapp.backend.dto.management.top.ProductSaleCount @@ -23,7 +22,7 @@ class AdminController( ResponseEntity.ok(ApiResponse(adminService.getRegisteredUsers())) @GetMapping("/bookmarked-products") - fun getBookmarkedProducts(): ResponseEntity>> = + fun getBookmarkedProducts(): ResponseEntity>> = ResponseEntity.ok(ApiResponse(adminService.getBookmarkedProducts())) @GetMapping("/top-five-bookmarked") diff --git a/src/main/kotlin/org/meliapp/backend/dto/management/BookmarkBasicResume.kt b/src/main/kotlin/org/meliapp/backend/dto/management/BookmarkBasicResume.kt deleted file mode 100644 index 9fb6f5e..0000000 --- a/src/main/kotlin/org/meliapp/backend/dto/management/BookmarkBasicResume.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.meliapp.backend.dto.management - -import com.fasterxml.jackson.annotation.JsonProperty - -data class BookmarkBasicResume( - @JsonProperty("mali_id") - val meliId: String, - val title: String, - val quantity: Long -) diff --git a/src/main/kotlin/org/meliapp/backend/dto/management/UserBasicResume.kt b/src/main/kotlin/org/meliapp/backend/dto/management/UserBasicResume.kt index 36d9440..aa5293d 100644 --- a/src/main/kotlin/org/meliapp/backend/dto/management/UserBasicResume.kt +++ b/src/main/kotlin/org/meliapp/backend/dto/management/UserBasicResume.kt @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty import java.time.LocalDateTime data class UserBasicResume( + val id: Long, val email: String, @JsonProperty("created_at") val createdAt: LocalDateTime diff --git a/src/main/kotlin/org/meliapp/backend/repository/BookmarkRepository.kt b/src/main/kotlin/org/meliapp/backend/repository/BookmarkRepository.kt index ac534cd..4cca04c 100644 --- a/src/main/kotlin/org/meliapp/backend/repository/BookmarkRepository.kt +++ b/src/main/kotlin/org/meliapp/backend/repository/BookmarkRepository.kt @@ -1,6 +1,5 @@ package org.meliapp.backend.repository -import org.meliapp.backend.dto.management.BookmarkBasicResume import org.meliapp.backend.dto.management.top.ProductBookmarkCount import org.meliapp.backend.model.Bookmark import org.springframework.data.domain.Pageable @@ -26,10 +25,10 @@ interface BookmarkRepository : JpaRepository { fun getMostBookmarked(pageable: Pageable): List @Query(""" - SELECT new org.meliapp.backend.dto.management.BookmarkBasicResume(p.meliId, p.title, COUNT(p)) + SELECT new org.meliapp.backend.dto.management.top.ProductBookmarkCount(p.meliId, p.title, COUNT(p)) FROM Bookmark b JOIN b.product p GROUP BY p.meliId, p.title ORDER BY p.title DESC """) - fun getBookmarksBasicResume(): List + fun getBookmarksBasicResume(): List } \ No newline at end of file diff --git a/src/main/kotlin/org/meliapp/backend/repository/UserRepository.kt b/src/main/kotlin/org/meliapp/backend/repository/UserRepository.kt index afa4e9d..36b3955 100644 --- a/src/main/kotlin/org/meliapp/backend/repository/UserRepository.kt +++ b/src/main/kotlin/org/meliapp/backend/repository/UserRepository.kt @@ -13,7 +13,7 @@ interface UserRepository : JpaRepository { fun existsByEmail(email: String): Boolean @Query(""" - SELECT new org.meliapp.backend.dto.management.UserBasicResume(u.email, u.createdAt) + SELECT new org.meliapp.backend.dto.management.UserBasicResume(u.id, u.email, u.createdAt) FROM User u INNER JOIN u.roles r WHERE r.name = 'ROLE_USER' """) diff --git a/src/main/kotlin/org/meliapp/backend/service/AdminService.kt b/src/main/kotlin/org/meliapp/backend/service/AdminService.kt index 1b6bd20..f3d88b9 100644 --- a/src/main/kotlin/org/meliapp/backend/service/AdminService.kt +++ b/src/main/kotlin/org/meliapp/backend/service/AdminService.kt @@ -1,6 +1,5 @@ package org.meliapp.backend.service -import org.meliapp.backend.dto.management.BookmarkBasicResume import org.meliapp.backend.dto.management.UserBasicResume import org.meliapp.backend.dto.management.top.ProductBookmarkCount import org.meliapp.backend.dto.management.top.ProductSaleCount @@ -32,6 +31,6 @@ class AdminService( fun top5Buyers(): List = purchaseRepository.getTopBuyers(pageRequest) - fun getBookmarkedProducts(): List = + fun getBookmarkedProducts(): List = bookmarkRepository.getBookmarksBasicResume() }