Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class Advertisement {
private String description;

@Column(name = "price", nullable = false, length = 55)
private Double price;
private Long price;

@Column(name = "creation_date", nullable = false)
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class AdvertisementDocument {
private Long id;
private String title;
private String description;
private Double price;
private Long price;
private Date creationDate;
private Date updateDate;
private Boolean isEnabled;
Expand Down

This file was deleted.

This file was deleted.

28 changes: 0 additions & 28 deletions src/main/java/ua/everybuy/routing/controller/FilterController.java

This file was deleted.

5 changes: 1 addition & 4 deletions src/main/java/ua/everybuy/routing/dto/AdvertisementDto.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package ua.everybuy.routing.dto;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import ua.everybuy.database.entity.Category;
import ua.everybuy.database.entity.City;
import ua.everybuy.routing.dto.util.PriceSerializer;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
Expand All @@ -18,8 +16,7 @@ public class AdvertisementDto {
private Long id;
private String title;
private String description;
@JsonSerialize(using = PriceSerializer.class)
private Double price;
private Long price;
private LocalDateTime creationDate;
private Boolean isEnabled;
private Boolean isNegotiable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
package ua.everybuy.routing.dto;

import java.util.List;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import ua.everybuy.routing.dto.response.FilteredAdvertisementsResponse;
import ua.everybuy.routing.dto.util.PriceSerializer;

@Getter
@Setter
@Builder
public class AdvertisementSearchResultDto {
private long totalAdvertisements;
private int totalPages;
@JsonSerialize(using = PriceSerializer.class)
private Double minPrice;
@JsonSerialize(using = PriceSerializer.class)
private Double maxPrice;
private Long minPrice;
private Long maxPrice;
private List<FilteredAdvertisementsResponse> advertisements;
}
9 changes: 2 additions & 7 deletions src/main/java/ua/everybuy/routing/dto/PriceRangeDto.java
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
package ua.everybuy.routing.dto;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.springframework.context.annotation.Bean;
import ua.everybuy.routing.dto.util.PriceSerializer;

@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class PriceRangeDto {
@JsonSerialize(using = PriceSerializer.class)
private Double minPrice;
@JsonSerialize(using = PriceSerializer.class)
private Double maxPrice;
private Long minPrice;
private Long maxPrice;
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
@ToString
public class AdvertisementSearchParametersDto {
@Min(0)
private Double minPrice;
private Long minPrice;
@Min(0)
private Double maxPrice;
private Long maxPrice;
private Long regionId;
private Long cityId;
private Long topSubCategoryId;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public record CreateAdvertisementRequest(
String description,

@NotNull(message = "Price is required")
@DecimalMin(value = "0.0", inclusive = true, message = "Price must be a positive number")
Double price,
@Min(value = 0, message = "Price must be a positive number")
Long price,

@NotNull(message = "City ID is required")
Long cityId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public record UpdateAdvertisementRequest(
String description,

@NotNull(message = "Price is required")
@DecimalMin(value = "0.0", inclusive = true, message = "Price must be a positive number")
Double price,
@Min(value = 0, message = "Price must be a positive number")
Long price,

@NotNull(message = "City ID is required")
Long cityId,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package ua.everybuy.routing.dto.response;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;
import lombok.Setter;
import ua.everybuy.routing.dto.util.PriceSerializer;

@Getter
@Setter
Expand All @@ -12,8 +10,7 @@ public class AdvertisementWithStatisticResponse {
private String section;
private String title;
private String productType;
@JsonSerialize(using = PriceSerializer.class)
private Double price;
private Long price;
private Long userId;
private String mainPhotoUrl;
private Integer favouriteCount;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package ua.everybuy.routing.dto.response;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;
import lombok.Setter;
import ua.everybuy.routing.dto.util.PriceSerializer;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
Expand All @@ -14,8 +12,7 @@ public class CreateAdvertisementResponse {
private Long id;
private String title;
private String description;
@JsonSerialize(using = PriceSerializer.class)
private Double price;
private Long price;
private LocalDateTime creationDate;
private Boolean isEnabled;
private Boolean isNegotiable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package ua.everybuy.routing.dto.response;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import ua.everybuy.database.entity.Advertisement;
import ua.everybuy.database.entity.Category;
import ua.everybuy.database.entity.City;
import ua.everybuy.routing.dto.util.PriceSerializer;

import java.time.LocalDateTime;

@Getter
Expand All @@ -21,8 +18,7 @@ public class FavouriteAdvertisementResponse {
private String mainPhotoUrl;
private String title;
private Advertisement.ProductType productType;
@JsonSerialize(using = PriceSerializer.class)
private Double price;
private Long price;
private LocalDateTime updateDate;
private Category category;
private City city;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package ua.everybuy.routing.dto.response;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;
import lombok.Setter;
import ua.everybuy.database.entity.Advertisement;
import ua.everybuy.database.entity.City;
import ua.everybuy.routing.dto.CategoryDto;
import ua.everybuy.routing.dto.SubCategoryDto;
import ua.everybuy.routing.dto.util.PriceSerializer;

import java.time.LocalDateTime;

@Getter
Expand All @@ -20,8 +17,7 @@ public class FilteredAdvertisementsResponse {
private String title;
private Advertisement.ProductType productType;
private String section;
@JsonSerialize(using = PriceSerializer.class)
private Double price;
private Long price;
private String description;
private Boolean isNegotiable;
private LocalDateTime updateDate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package ua.everybuy.routing.dto.response;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;
import lombok.Setter;
import ua.everybuy.routing.dto.util.PriceSerializer;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
Expand All @@ -15,8 +12,7 @@ public class UpdateAdvertisementResponse {
private Long id;
private String title;
private String description;
@JsonSerialize(using = PriceSerializer.class)
private Double price;
private Long price;
private LocalDateTime creationDate;
private LocalDateTime updateDate;
private Boolean isEnabled;
Expand Down
16 changes: 0 additions & 16 deletions src/main/java/ua/everybuy/routing/dto/util/PriceSerializer.java

This file was deleted.

Loading
Loading