diff --git a/src/main/java/ru/soune/nocopy/dto/tarriff/TariffDTO.java b/src/main/java/ru/soune/nocopy/dto/tarriff/TariffDTO.java index 3c7627a..f0475ac 100644 --- a/src/main/java/ru/soune/nocopy/dto/tarriff/TariffDTO.java +++ b/src/main/java/ru/soune/nocopy/dto/tarriff/TariffDTO.java @@ -17,4 +17,5 @@ public class TariffDTO { private Long diskSize; private Long maxUsers; private String tariffTerm; + private String description; } diff --git a/src/main/java/ru/soune/nocopy/dto/tarriff/TariffRequest.java b/src/main/java/ru/soune/nocopy/dto/tarriff/TariffRequest.java index 524cccf..1eb335c 100644 --- a/src/main/java/ru/soune/nocopy/dto/tarriff/TariffRequest.java +++ b/src/main/java/ru/soune/nocopy/dto/tarriff/TariffRequest.java @@ -52,4 +52,7 @@ public class TariffRequest { @JsonProperty("tariff_term") private String tariffTerm; + + @JsonProperty("description") + private String description; } \ No newline at end of file diff --git a/src/main/java/ru/soune/nocopy/entity/tarif/Tariff.java b/src/main/java/ru/soune/nocopy/entity/tarif/Tariff.java index 3e6d3f6..26e1384 100644 --- a/src/main/java/ru/soune/nocopy/entity/tarif/Tariff.java +++ b/src/main/java/ru/soune/nocopy/entity/tarif/Tariff.java @@ -41,6 +41,9 @@ public class Tariff { @Column(name = "tariffAccountType") private String tariffAccountType; + @Column(name = "description", columnDefinition = "TEXT") + private String description; + @Column(name = "tariff_term") @Enumerated(EnumType.STRING) private TariffTimeTerm tariffTerm; diff --git a/src/main/java/ru/soune/nocopy/handler/TariffHandler.java b/src/main/java/ru/soune/nocopy/handler/TariffHandler.java index af98a80..7dd6360 100644 --- a/src/main/java/ru/soune/nocopy/handler/TariffHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/TariffHandler.java @@ -65,7 +65,7 @@ public class TariffHandler implements RequestHandler { private BaseResponse handleAddTariff(BaseRequest request, TariffRequest tariffRequest) { tariffService.addTariff(tariffRequest.getName(), tariffRequest.getPrice(), tariffRequest.getType(), tariffRequest.getTokens(), tariffRequest.getDiskSize(), tariffRequest.getMaxUsers(), - tariffRequest.getMaxFilesCount(), tariffRequest.getTariffTerm()); + tariffRequest.getMaxFilesCount(), tariffRequest.getTariffTerm(), tariffRequest.getDescription()); TariffResponse tariffResponse = TariffResponse.builder() .tariffName(tariffRequest.getName()) diff --git a/src/main/java/ru/soune/nocopy/service/tariff/TariffService.java b/src/main/java/ru/soune/nocopy/service/tariff/TariffService.java index c8309a3..0e99745 100644 --- a/src/main/java/ru/soune/nocopy/service/tariff/TariffService.java +++ b/src/main/java/ru/soune/nocopy/service/tariff/TariffService.java @@ -21,7 +21,7 @@ public class TariffService { private final TariffRepository tariffRepository; public void addTariff(String tariffName, double price, String type, int tokens, long diskSize, long maxUsers, - int maxFilesCount, String tariffTerm) { + int maxFilesCount, String tariffTerm, String description) { Tariff tariff = new Tariff(); tariff.setName(tariffName); tariff.setPrice(price); @@ -31,6 +31,7 @@ public class TariffService { tariff.setMaxUsers(maxUsers); tariff.setMaxFilesCount(maxFilesCount); tariff.setTariffTerm(TariffTimeTerm.valueOf(tariffTerm.toUpperCase())); + tariff.setDescription(description); tariffRepository.save(tariff); } @@ -113,7 +114,8 @@ public class TariffService { tariff.getMaxFilesCount(), tariff.getDiskSize(), tariff.getMaxUsers(), - tariffTerm == null ? "" : tariffTerm.name() + tariffTerm == null ? "" : tariffTerm.name(), + tariff.getDescription() == null ? "" : tariff.getDescription() ); } @@ -125,6 +127,7 @@ public class TariffService { tariff.setMaxFilesCount(dto.getMaxFilesCount()); tariff.setDiskSize(dto.getDiskSize()); tariff.setMaxUsers(dto.getMaxUsers()); + tariff.setDescription(dto.getDescription()); tariff.setTariffTerm(TariffTimeTerm.valueOf(dto.getTariffTerm().toUpperCase())); } }