Browse Source

fix: remove itemInstalledAt prop from marketplace read DTO

Matheus Marques Polillo 9 months ago
parent
commit
0f0ce674ec

+ 0 - 1
src/domain/dto/readMarketplaceInstalledItems.go

@@ -11,7 +11,6 @@ type ReadMarketplaceInstalledItemsRequest struct {
 	Hostname         *valueObject.Fqdn                         `json:"hostname,omitempty"`
 	Type             *valueObject.MarketplaceItemType          `json:"type,omitempty"`
 	InstallationUuid *valueObject.MarketplaceInstalledItemUuid `json:"installationUuid,omitempty"`
-	InstalledAt      *valueObject.UnixTime                     `json:"installedAt,omitempty"`
 }
 
 type ReadMarketplaceInstalledItemsResponse struct {

+ 3 - 6
src/infra/marketplace/marketplaceQueryRepo.go

@@ -656,12 +656,9 @@ func (repo *MarketplaceQueryRepo) ReadInstalledItems(
 		model.InstallUuid = readDto.InstallationUuid.String()
 	}
 
-	dbQuery := repo.persistentDbSvc.Handler.Where(&model)
-	if readDto.InstalledAt != nil {
-		dbQuery = dbQuery.Where("created_at = ?", readDto.InstalledAt.GetAsGoTime())
-	}
-
-	dbQuery = dbQuery.Limit(int(readDto.Pagination.ItemsPerPage))
+	dbQuery := repo.persistentDbSvc.Handler.
+		Where(&model).
+		Limit(int(readDto.Pagination.ItemsPerPage))
 	if readDto.Pagination.LastSeenId == nil {
 		offset := int(readDto.Pagination.PageNumber) * int(readDto.Pagination.ItemsPerPage)
 		dbQuery = dbQuery.Offset(offset)

+ 0 - 1
src/presentation/api/controller/marketplace.go

@@ -205,7 +205,6 @@ func (controller *MarketplaceController) InstallCatalogItem(c echo.Context) erro
 // @Param        hostname query  string  false  "Hostname"
 // @Param        type query  string  false  "Type"
 // @Param        installationUuid query  string  false  "InstallUuid"
-// @Param        installedAt query  string  false  "CreatedAt"
 // @Param        pageNumber query  uint  false  "PageNumber (Pagination)"
 // @Param        itemsPerPage query  uint  false  "ItemsPerPage (Pagination)"
 // @Param        sortBy query  string  false  "SortBy (Pagination)"

+ 0 - 8
src/presentation/cli/controller/marketplace.go

@@ -204,7 +204,6 @@ func (controller *MarketplaceController) InstallCatalogItem() *cobra.Command {
 func (controller *MarketplaceController) ReadInstalledItems() *cobra.Command {
 	var installedItemIdUint uint64
 	var installedItemHostnameStr, installedItemTypeStr, installedItemUuidStr string
-	var itemInstalledAt int64
 	var paginationPageNumberUint32 uint32
 	var paginationItemsPerPageUint16 uint16
 	var paginationSortByStr, paginationSortDirectionStr, paginationLastSeenIdStr string
@@ -231,10 +230,6 @@ func (controller *MarketplaceController) ReadInstalledItems() *cobra.Command {
 				requestBody["installId"] = installedItemUuidStr
 			}
 
-			if itemInstalledAt != 0 {
-				requestBody["installedAt"] = itemInstalledAt
-			}
-
 			if paginationPageNumberUint32 != 0 {
 				requestBody["pageNumber"] = paginationPageNumberUint32
 			}
@@ -274,9 +269,6 @@ func (controller *MarketplaceController) ReadInstalledItems() *cobra.Command {
 	cmd.Flags().StringVarP(
 		&installedItemUuidStr, "installed-item-uuid", "u", "", "InstalledItemUuidStr",
 	)
-	cmd.Flags().Int64VarP(
-		&itemInstalledAt, "item-installed-at", "b", 0, "ItemInstalledAt (UnixTime)",
-	)
 	cmd.Flags().Uint32VarP(
 		&paginationPageNumberUint32, "page-number", "p", 0, "PageNumber (Pagination)",
 	)

+ 0 - 10
src/presentation/service/marketplace.go

@@ -288,15 +288,6 @@ func (service *MarketplaceService) ReadInstalledItems(
 		installationUuidPtr = &installationUuid
 	}
 
-	var installedAtPtr *valueObject.UnixTime
-	if input["installedAt"] != nil {
-		installedAt, err := valueObject.NewUnixTime(input["installedAt"])
-		if err != nil {
-			return NewServiceOutput(UserError, errors.New("InvalidInstalledAt"))
-		}
-		installedAtPtr = &installedAt
-	}
-
 	paginationDto := useCase.MarketplaceDefaultPagination
 	if input["pageNumber"] != nil {
 		pageNumber, err := voHelper.InterfaceToUint32(input["pageNumber"])
@@ -346,7 +337,6 @@ func (service *MarketplaceService) ReadInstalledItems(
 		Hostname:         hostnamePtr,
 		Type:             typePtr,
 		InstallationUuid: installationUuidPtr,
-		InstalledAt:      installedAtPtr,
 	}
 
 	marketplaceQueryRepo := marketplaceInfra.NewMarketplaceQueryRepo(