From 1e415568e87f9cf83bc8122add707442aefc5091 Mon Sep 17 00:00:00 2001 From: Fagorym Date: Sun, 19 May 2024 16:57:36 +0700 Subject: [PATCH] Delete price column --- .../dto/request/RequestEstablishmentDto.java | 10 ---------- .../establishmentservice/model/Establishment.java | 2 -- .../resources/db/migration/V13__drop_price_column.sql | 2 ++ .../database/establishment/default_establishment.xml | 1 - ...lishment.sql => V14__delete_from_establishment.sql} | 0 5 files changed, 2 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/db/migration/V13__drop_price_column.sql rename src/test/resources/db/migration/{V13__delete_from_establishment.sql => V14__delete_from_establishment.sql} (100%) diff --git a/src/main/java/ru/nsu/fit/directors/establishmentservice/dto/request/RequestEstablishmentDto.java b/src/main/java/ru/nsu/fit/directors/establishmentservice/dto/request/RequestEstablishmentDto.java index f39a55a..feb5251 100644 --- a/src/main/java/ru/nsu/fit/directors/establishmentservice/dto/request/RequestEstablishmentDto.java +++ b/src/main/java/ru/nsu/fit/directors/establishmentservice/dto/request/RequestEstablishmentDto.java @@ -3,8 +3,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import jakarta.validation.Valid; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; @@ -49,14 +47,6 @@ public class RequestEstablishmentDto { private String category; @NotNull(message = "Основное изображение не может быть не задано.") private String image; - @Min(value = 1, message = "Рейтинг не может быть меньше 1.") - @Max(value = 5, message = "Рейтинг не может быть больше 5.") - @NotNull(message = "Рейтинг не может быть не задан.") - private Float rating; - @Max(value = 10000, message = "Средний чек не может быть больше 10000") - @Min(value = 500, message = "Средний чек не может быть меньше 500") - @NotNull(message = "Информация о среднем чеке не может быть не задана.") - private Integer price; @NotNull(message = "Информация о рабочих часах заведения не может быть не задано.") @Size(min = 1, max = 7, message = "Дней работы не может быть меньше 1 и больше 7") @Valid diff --git a/src/main/java/ru/nsu/fit/directors/establishmentservice/model/Establishment.java b/src/main/java/ru/nsu/fit/directors/establishmentservice/model/Establishment.java index 71ba0cd..299fb88 100644 --- a/src/main/java/ru/nsu/fit/directors/establishmentservice/model/Establishment.java +++ b/src/main/java/ru/nsu/fit/directors/establishmentservice/model/Establishment.java @@ -49,8 +49,6 @@ public class Establishment { private Float rating; - private Integer price; - @Enumerated(EnumType.STRING) @Column(name = "category", insertable = false, updatable = false) private Category category; diff --git a/src/main/resources/db/migration/V13__drop_price_column.sql b/src/main/resources/db/migration/V13__drop_price_column.sql new file mode 100644 index 0000000..04204d7 --- /dev/null +++ b/src/main/resources/db/migration/V13__drop_price_column.sql @@ -0,0 +1,2 @@ +ALTER TABLE establishments + DROP COLUMN price; diff --git a/src/test/resources/database/establishment/default_establishment.xml b/src/test/resources/database/establishment/default_establishment.xml index b9cf536..0a9f92f 100644 --- a/src/test/resources/database/establishment/default_establishment.xml +++ b/src/test/resources/database/establishment/default_establishment.xml @@ -5,7 +5,6 @@ description="Милый китайский ресторанчик в центре Москвы" address="г. Москва, улица Бронная д. 45" rating="4.5" - price="4000" has_map="false" has_card_payment="true" image="image" diff --git a/src/test/resources/db/migration/V13__delete_from_establishment.sql b/src/test/resources/db/migration/V14__delete_from_establishment.sql similarity index 100% rename from src/test/resources/db/migration/V13__delete_from_establishment.sql rename to src/test/resources/db/migration/V14__delete_from_establishment.sql