From e9f5ccba192f71676b09d30cee9d42707cb71cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Rou=C4=8Da?= <xrouca@fi.muni.cz>
Date: Fri, 21 Apr 2023 19:57:49 +0200
Subject: [PATCH] Updated companyId in electricityPrice
---
.../electricityprices/ElectricityPrice.java | 2 +-
.../ElectricityPriceController.java | 10 +--
.../ElectricityPriceRepository.java | 4 +-
.../ElectricityPriceService.java | 6 +-
.../ElectricityPriceServiceImpl.java | 12 ++--
.../dtos/ElectricityPriceGetFullDto.java | 2 +-
.../dtos/ElectricityPricePostDto.java | 2 +-
.../ElectricityPriceControllerTest.java | 70 ++++++++-----------
.../ElectricityPriceServiceTest.java | 17 ++---
.../src/main/resources/banner.txt | 6 ++
10 files changed, 63 insertions(+), 68 deletions(-)
create mode 100644 emailmicroservice/src/main/resources/banner.txt
diff --git a/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPrice.java b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPrice.java
index e061b22..37df16f 100644
--- a/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPrice.java
+++ b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPrice.java
@@ -30,7 +30,7 @@ public class ElectricityPrice implements Serializable {
}
@Column
- private Long companyId;
+ private String companyId;
@Column
private double priceHighTariff;
diff --git a/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceController.java b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceController.java
index 1f76580..67ad3d5 100644
--- a/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceController.java
+++ b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceController.java
@@ -85,12 +85,12 @@ public class ElectricityPriceController {
schema = @Schema(implementation = ElectricityPrice.class))
}),
@ApiResponse(
- responseCode = "400",
+ responseCode = "404",
description = "Invalid or non-exsisting company id supplied",
content = @Content)
})
@GetMapping(path = "/{companyId}")
- public double getElectricityPrice(@PathVariable("companyId") Long companyId) {
+ public double getElectricityPrice(@PathVariable("companyId") String companyId) {
return electricityPriceService.getElectricityPrice(companyId);
}
@@ -132,12 +132,12 @@ public class ElectricityPriceController {
@Content(mediaType = "application/json",
schema = @Schema(implementation = ElectricityPrice.class)) }),
@ApiResponse(
- responseCode = "400",
+ responseCode = "404",
description = "Invalid or non-exsisting company id supplied",
content = @Content)
})
@DeleteMapping(path = "/{companyId}")
- public String deleteElectricityPriceForCompany(@PathVariable("companyId") Long companyId) {
+ public String deleteElectricityPriceForCompany(@PathVariable("companyId") String companyId) {
return electricityPriceService.deleteElectricityPriceForCompany(companyId);
}
@@ -158,7 +158,7 @@ public class ElectricityPriceController {
})
})
@GetMapping("/page")
- public Page<ElectricityPriceGetFullDto> getAllElectricityPricePagable(Pageable pageable) {
+ public Page<ElectricityPriceGetFullDto> getAllElectricityPricePageable(Pageable pageable) {
return electricityPriceService.getAllElectricityPricePagable(pageable);
}
diff --git a/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceRepository.java b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceRepository.java
index aed2fe5..48be83d 100644
--- a/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceRepository.java
+++ b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceRepository.java
@@ -7,11 +7,11 @@ import org.springframework.stereotype.Repository;
@Repository
public interface ElectricityPriceRepository extends JpaRepository<ElectricityPrice, Long> {
- ElectricityPrice findByCompanyId(Long companyId);
+ ElectricityPrice findByCompanyId(String companyId);
@Modifying
@Query(value = "DELETE FROM electricityprices WHERE company_id = ?1", nativeQuery = true)
- void deleteCompany(Long companyId);
+ void deleteCompany(String companyId);
@Query(value = "SELECT AVG(price_low_tariff) FROM electricityprices", nativeQuery = true)
double averagePriceLowTariff();
diff --git a/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceService.java b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceService.java
index 36df35d..2854244 100644
--- a/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceService.java
+++ b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceService.java
@@ -12,14 +12,14 @@ public interface ElectricityPriceService {
public double averagePriceHighTariff();
- ElectricityPriceGetFullDto getElectricityPriceObj(Long companyId);
- double getElectricityPrice(Long companyId); // dependent on time - low or high tariff
+ ElectricityPriceGetFullDto getElectricityPriceObj(String companyId);
+ double getElectricityPrice(String companyId); // dependent on time - low or high tariff
Page<ElectricityPriceGetFullDto> getAllElectricityPricePagable(Pageable pages);
List<ElectricityPriceGetFullDto> getAllElectricityPrice();
- String deleteElectricityPriceForCompany(Long companyId);
+ String deleteElectricityPriceForCompany(String companyId);
ElectricityPrice setElectricityPrice(ElectricityPricePostDto req);
}
diff --git a/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceServiceImpl.java b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceServiceImpl.java
index 6f1d8d3..62174e4 100644
--- a/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceServiceImpl.java
+++ b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceServiceImpl.java
@@ -30,7 +30,7 @@ public class ElectricityPriceServiceImpl implements ElectricityPriceService {
public void init() {
electricityPriceRepository.save(
ElectricityPrice.builder()
- .companyId(1L)
+ .companyId("1")
.priceHighTariff(399.0)
.priceLowTariff(299.0)
.build());
@@ -38,17 +38,17 @@ public class ElectricityPriceServiceImpl implements ElectricityPriceService {
@Override
@Transactional(readOnly = true)
- public double getElectricityPrice(Long companyId) {
+ public double getElectricityPrice(String companyId) {
ElectricityPrice electricityPrice = electricityPriceRepository.findByCompanyId(companyId);
if (electricityPrice == null) {
- throw new ResponseStatusException(HttpStatus.BAD_REQUEST,"No electricity price information for that company.");
+ throw new ResponseStatusException(HttpStatus.NOT_FOUND,"No electricity price information for that company.");
}
return getPriceAcordingToDate(electricityPrice);
}
@Override
@Transactional(readOnly = true)
- public ElectricityPriceGetFullDto getElectricityPriceObj(Long companyId) {
+ public ElectricityPriceGetFullDto getElectricityPriceObj(String companyId) {
return mapStructMapper.electricityPriceToElectricityPriceGetFullDto(electricityPriceRepository.findByCompanyId(companyId));
}
@@ -78,13 +78,13 @@ public class ElectricityPriceServiceImpl implements ElectricityPriceService {
@Override
@Transactional
- public String deleteElectricityPriceForCompany(Long companyId) {
+ public String deleteElectricityPriceForCompany(String companyId) {
return Optional.ofNullable(electricityPriceRepository.findByCompanyId(companyId))
.map(electricityPrice -> {
electricityPriceRepository.deleteCompany(companyId);
return "Deleted electricity price for a company.";
})
- .orElseThrow(() -> new ResponseStatusException(HttpStatus.BAD_REQUEST, "Did not delete the electricity prices - company not found."));
+ .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Did not delete the electricity prices - company not found."));
}
@Override
diff --git a/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/dtos/ElectricityPriceGetFullDto.java b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/dtos/ElectricityPriceGetFullDto.java
index 98f0972..2825b09 100644
--- a/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/dtos/ElectricityPriceGetFullDto.java
+++ b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/dtos/ElectricityPriceGetFullDto.java
@@ -8,7 +8,7 @@ import lombok.Setter;
public class ElectricityPriceGetFullDto {
private Long id;
- private Long companyId;
+ private String companyId;
private double priceHighTariff;
diff --git a/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/dtos/ElectricityPricePostDto.java b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/dtos/ElectricityPricePostDto.java
index c417c00..a8a3cca 100644
--- a/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/dtos/ElectricityPricePostDto.java
+++ b/electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/dtos/ElectricityPricePostDto.java
@@ -11,7 +11,7 @@ public class ElectricityPricePostDto {
@NotNull
@JsonProperty("companyId")
- private Long companyId;
+ private String companyId;
@NotNull
@JsonProperty("priceHighTariff")
diff --git a/electricityTarifMicroservice/src/test/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceControllerTest.java b/electricityTarifMicroservice/src/test/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceControllerTest.java
index a5ac1ec..79c18e2 100644
--- a/electricityTarifMicroservice/src/test/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceControllerTest.java
+++ b/electricityTarifMicroservice/src/test/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceControllerTest.java
@@ -11,7 +11,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.domain.Page;
import org.springframework.test.web.servlet.MockMvc;
import java.time.DayOfWeek;
@@ -21,9 +20,11 @@ import java.util.List;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.hamcrest.Matchers.hasSize;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@SpringBootTest
@AutoConfigureMockMvc
@@ -31,6 +32,7 @@ class ElectricityPriceControllerTest {
@Autowired
private MockMvc mockMvc;
+
@Autowired
private ObjectMapper objectMapper;
@@ -44,13 +46,13 @@ class ElectricityPriceControllerTest {
@BeforeEach
void setUp() {
ElectricityPricePostDto newDto = new ElectricityPricePostDto();
- newDto.setCompanyId(1L);
+ newDto.setCompanyId("1");
newDto.setPriceLowTariff(200.0);
newDto.setPriceHighTariff(300.0);
electricityPriceService.setElectricityPrice(newDto);
ElectricityPricePostDto newDto2 = new ElectricityPricePostDto();
- newDto2.setCompanyId(2L);
+ newDto2.setCompanyId("2");
newDto2.setPriceLowTariff(250.0);
newDto2.setPriceHighTariff(300.0);
electricityPriceService.setElectricityPrice(newDto2);
@@ -68,7 +70,6 @@ class ElectricityPriceControllerTest {
/**
* Tests the {@link ElectricityPriceController#getAllElectricityPrice()}
* Expect all Electricity prices for all companies
- * @throws Exception
*/
@Test
void shouldGetAllElectricityPrices() throws Exception {
@@ -78,15 +79,16 @@ class ElectricityPriceControllerTest {
.andReturn()
.getResponse()
.getContentAsString();
- ElectricityPriceGetFullDto[] listPrices = objectMapper.readValue(response, new TypeReference<ElectricityPriceGetFullDto[]>() {});
+ ElectricityPriceGetFullDto[] listPrices = objectMapper.readValue(response, new TypeReference<ElectricityPriceGetFullDto[]>() {
+ });
assertThat(listPrices.length).isEqualTo(2);
- assertThat(listPrices[0].getCompanyId()).isEqualTo(1L);
+ assertThat(listPrices[0].getCompanyId()).isEqualTo("1");
assertThat(listPrices[0].getPriceLowTariff()).isEqualTo(200.0);
assertThat(listPrices[0].getPriceHighTariff()).isEqualTo(300.0);
- assertThat(listPrices[1].getCompanyId()).isEqualTo(2L);
+ assertThat(listPrices[1].getCompanyId()).isEqualTo("2");
assertThat(listPrices[1].getPriceLowTariff()).isEqualTo(250.0);
assertThat(listPrices[1].getPriceHighTariff()).isEqualTo(300.0);
@@ -95,12 +97,11 @@ class ElectricityPriceControllerTest {
/**
* Tests the {@link ElectricityPriceController#getAllElectricityPrice()}
* Expect empty list of Electricity prices
- * @throws Exception
*/
@Test
void shouldGetNoneElectricityPrices() throws Exception {
- electricityPriceService.deleteElectricityPriceForCompany(1L);
- electricityPriceService.deleteElectricityPriceForCompany(2L);
+ electricityPriceService.deleteElectricityPriceForCompany("1");
+ electricityPriceService.deleteElectricityPriceForCompany("2");
String response = mockMvc.perform(get(URL)
.contentType(CONTENT_TYPE))
@@ -108,15 +109,15 @@ class ElectricityPriceControllerTest {
.andReturn()
.getResponse()
.getContentAsString();
- ElectricityPriceGetFullDto[] listPrices = objectMapper.readValue(response, new TypeReference<ElectricityPriceGetFullDto[]>() {});
+ ElectricityPriceGetFullDto[] listPrices = objectMapper.readValue(response, new TypeReference<ElectricityPriceGetFullDto[]>() {
+ });
assertThat(listPrices.length).isEqualTo(0);
}
/**
- * Tests the {@link ElectricityPriceController#getElectricityPrice(Long)}
+ * Tests the {@link ElectricityPriceController#getElectricityPrice(String)}
* Expect the price according to the current time
- * @throws Exception
*/
@Test
void shouldGetElectricityPrice() throws Exception {
@@ -139,34 +140,32 @@ class ElectricityPriceControllerTest {
}
/**
- * Tests the {@link ElectricityPriceController#getElectricityPrice(Long)}
+ * Tests the {@link ElectricityPriceController#getElectricityPrice(String)}
* Expect status 400 due to the wrong company id
- * @throws Exception
*/
@Test
void shouldNotGetElectricityPriceForWrongCompanyId() throws Exception {
mockMvc.perform(get(URL + "/4")
.contentType(CONTENT_TYPE))
- .andExpect(status().isBadRequest());
+ .andExpect(status().isNotFound());
}
/**
* Tests the {@link ElectricityPriceController#setElectricityPrice(ElectricityPricePostDto)}
* Expect new Electricity price to be created
- * @throws Exception
*/
@Test
- void shouldCreateNewElectricityPrice() throws Exception{
+ void shouldCreateNewElectricityPrice() throws Exception {
ElectricityPricePostDto newDto = new ElectricityPricePostDto();
- newDto.setCompanyId(5L);
+ newDto.setCompanyId("5");
newDto.setPriceLowTariff(100.0);
newDto.setPriceHighTariff(200.0);
assertNull(electricityPriceService.getElectricityPriceObj(newDto.getCompanyId()));
String response = mockMvc.perform(post(URL)
- .contentType(CONTENT_TYPE)
- .content(objectMapper.writeValueAsString(newDto)))
+ .contentType(CONTENT_TYPE)
+ .content(objectMapper.writeValueAsString(newDto)))
.andExpect(status().isOk())
.andReturn()
.getResponse()
@@ -184,12 +183,11 @@ class ElectricityPriceControllerTest {
/**
* Tests the {@link ElectricityPriceController#setElectricityPrice(ElectricityPricePostDto)}
* Expect updated existing Electricity price
- * @throws Exception
*/
@Test
- void shouldUpdateExistingElectricityPrice() throws Exception{
+ void shouldUpdateExistingElectricityPrice() throws Exception {
ElectricityPricePostDto updatedDto = new ElectricityPricePostDto();
- updatedDto.setCompanyId(1L);
+ updatedDto.setCompanyId("1");
updatedDto.setPriceLowTariff(100.0);
updatedDto.setPriceHighTariff(200.0);
@@ -212,14 +210,13 @@ class ElectricityPriceControllerTest {
}
/**
- * Tests the {@link ElectricityPriceController#deleteElectricityPriceForCompany(Long)}
+ * Tests the {@link ElectricityPriceController#deleteElectricityPriceForCompany(String)}
* Expect status 200 for deleted Electricity price
- * @throws Exception
*/
@Test
void shouldDeleteExistingElectricityPriceForCompany() throws Exception {
ElectricityPricePostDto newDto = new ElectricityPricePostDto();
- Long companyId = 88L;
+ String companyId = "88";
newDto.setCompanyId(companyId);
newDto.setPriceLowTariff(200.0);
newDto.setPriceHighTariff(300.0);
@@ -233,23 +230,21 @@ class ElectricityPriceControllerTest {
}
/**
- * Tests the {@link ElectricityPriceController#deleteElectricityPriceForCompany(Long)}
+ * Tests the {@link ElectricityPriceController#deleteElectricityPriceForCompany(String)}
* Expect status 400 for non-existing company id
- * @throws Exception
*/
@Test
void shouldNotDeleteNonExistingElectricityPriceForCompany() throws Exception {
- Long wrongId = 88L;
+ String wrongId = "88";
assertNull(electricityPriceService.getElectricityPriceObj(wrongId));
mockMvc.perform(delete(URL + "/{id}", wrongId)
.contentType(CONTENT_TYPE))
- .andExpect(status().isBadRequest());
+ .andExpect(status().isNotFound());
}
/**
* Tests the {@link ElectricityPriceController#getAllElectricityPrice()}
* Expect all Electricity prices for all companies
- * @throws Exception
*/
@Test
void shouldGetAllElectricityPricesPageable() throws Exception {
@@ -262,12 +257,11 @@ class ElectricityPriceControllerTest {
/**
* Tests the {@link ElectricityPriceController#getAllElectricityPrice()}
* Expect empty list of Electricity prices
- * @throws Exception
*/
@Test
void shouldGetNoneElectricityPricesPageable() throws Exception {
- electricityPriceService.deleteElectricityPriceForCompany(1L);
- electricityPriceService.deleteElectricityPriceForCompany(2L);
+ electricityPriceService.deleteElectricityPriceForCompany("1");
+ electricityPriceService.deleteElectricityPriceForCompany("2");
mockMvc.perform(get(URL + "/page")
.contentType(CONTENT_TYPE))
@@ -279,7 +273,6 @@ class ElectricityPriceControllerTest {
/**
* Tests the {@link ElectricityPriceController#getAveragePriceHighTariff()}
* Expect average high tariff Electricity price
- * @throws Exception
*/
@Test
void getAveragePriceHighTariff() throws Exception {
@@ -297,7 +290,6 @@ class ElectricityPriceControllerTest {
/**
* Tests the {@link ElectricityPriceController#getAveragePriceHighTariff()}
* Expect average low tariff Electricity price
- * @throws Exception
*/
@Test
void getAveragePriceLowTariff() throws Exception {
diff --git a/electricityTarifMicroservice/src/test/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceServiceTest.java b/electricityTarifMicroservice/src/test/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceServiceTest.java
index e1e08e2..4715c24 100644
--- a/electricityTarifMicroservice/src/test/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceServiceTest.java
+++ b/electricityTarifMicroservice/src/test/java/cz/muni/fi/pa165/electricityTarifMicroservice/electricityprices/ElectricityPriceServiceTest.java
@@ -13,11 +13,9 @@ import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.LocalTime;
import java.util.List;
-import java.util.Optional;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.openMocks;
@@ -26,7 +24,6 @@ class ElectricityPriceServiceTest {
@InjectMocks
private ElectricityPriceServiceImpl electricityPriceService;
-
@Mock
private ElectricityPriceMapperImpl electricityPriceMapper;
@Mock
@@ -65,7 +62,7 @@ class ElectricityPriceServiceTest {
void shouldGetElectricityPriceObj() {
ElectricityPrice electricityPrice = ElectricityPrice
.builder()
- .companyId(1L)
+ .companyId("1")
.priceLowTariff(200.0)
.priceHighTariff(300.0)
.build();
@@ -90,7 +87,7 @@ class ElectricityPriceServiceTest {
void shouldGetElectricityPrice() {
ElectricityPrice electricityPrice = ElectricityPrice
.builder()
- .companyId(1L)
+ .companyId("1")
.priceLowTariff(200.0)
.priceHighTariff(300.0)
.build();
@@ -117,7 +114,7 @@ class ElectricityPriceServiceTest {
void shouldGetAllElectricityPricePageable() {
ElectricityPrice electricityPrice1 = ElectricityPrice
.builder()
- .companyId(1L)
+ .companyId("1")
.priceLowTariff(200.0)
.priceHighTariff(300.0)
.build();
@@ -130,7 +127,7 @@ class ElectricityPriceServiceTest {
ElectricityPrice electricityPrice2 = ElectricityPrice
.builder()
- .companyId(2L)
+ .companyId("2")
.priceLowTariff(250.0)
.priceHighTariff(350.0)
.build();
@@ -151,7 +148,7 @@ class ElectricityPriceServiceTest {
when(electricityPriceMapper.mapToPageDto(page)).thenReturn(page2);
- Page<ElectricityPriceGetFullDto> result = electricityPriceService.getAllElectricityPricePagable(PageRequest.of(pageNumber,pageSize));
+ Page<ElectricityPriceGetFullDto> result = electricityPriceService.getAllElectricityPricePagable(PageRequest.of(pageNumber, pageSize));
verify(electricityPriceRepository).findAll(PageRequest.of(pageNumber, pageSize));
@@ -162,7 +159,7 @@ class ElectricityPriceServiceTest {
void shouldGetAllElectricityPrice() {
ElectricityPrice electricityPrice1 = ElectricityPrice
.builder()
- .companyId(1L)
+ .companyId("1")
.priceLowTariff(200.0)
.priceHighTariff(300.0)
.build();
@@ -175,7 +172,7 @@ class ElectricityPriceServiceTest {
ElectricityPrice electricityPrice2 = ElectricityPrice
.builder()
- .companyId(2L)
+ .companyId("2")
.priceLowTariff(250.0)
.priceHighTariff(350.0)
.build();
diff --git a/emailmicroservice/src/main/resources/banner.txt b/emailmicroservice/src/main/resources/banner.txt
new file mode 100644
index 0000000..1d2c4e3
--- /dev/null
+++ b/emailmicroservice/src/main/resources/banner.txt
@@ -0,0 +1,6 @@
+
+,------. ,--.,--. ,--. ,--.,--. ,--.
+| .---',--,--,--. ,--,--.`--'| | | `.' |`--' ,---.,--.--. ,---. ,---. ,---. ,--.--.,--. ,--.`--' ,---. ,---.
+| `--, | |' ,-. |,--.| | | |'.'| |,--.| .--'| .--'| .-. |( .-'| .-. :| .--' \ `' / ,--.| .--'| .-. :
+| `---.| | | |\ '-' || || | | | | || |\ `--.| | ' '-' '.-' `) --.| | \ / | |\ `--.\ --.
+`------'`--`--`--' `--`--'`--'`--' `--' `--'`--' `---'`--' `---' `----' `----'`--' `--' `--' `---' `----'
--
GitLab