added two custom queries - avg price low/high

electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceController.java

@@ -161,4 +161,44 @@ public class ElectricityPriceController {
   public Page<ElectricityPriceGetFullDto> getAllElectricityPricePagable(Pageable pageable) {
     return electricityPriceService.getAllElectricityPricePagable(pageable);
   }
+
+  @Operation(
+          summary = "Get average high tariff electricity price of all companies",
+          description = "Returns average high tariff electricity price of all companies from the database.",
+          tags = "{electricity price}")
+  @ApiResponses(
+          value = {
+                  @ApiResponse(
+                          responseCode = "200",
+                          description = "Found average high tariff electricity price",
+                          content = {
+                                  @Content(
+                                          mediaType = "application/json",
+                                          schema = @Schema(implementation = ElectricityPrice.class))
+                          })
+          })
+  @GetMapping("/avg/hightariff")
+  public double getAveragePriceHighTariff() {
+    return electricityPriceService.averagePriceHighTariff();
+  }
+
+  @Operation(
+          summary = "Get average low tariff electricity price of all companies",
+          description = "Returns average low tariff electricity price of all companies from the database.",
+          tags = "{electricity price}")
+  @ApiResponses(
+          value = {
+                  @ApiResponse(
+                          responseCode = "200",
+                          description = "Found average low tariff electricity price",
+                          content = {
+                                  @Content(
+                                          mediaType = "application/json",
+                                          schema = @Schema(implementation = ElectricityPrice.class))
+                          })
+          })
+  @GetMapping("/avg/lowtariff")
+  public double getAveragePriceLowTariff() {
+    return electricityPriceService.averagePriceLowTariff();
+  }
 }

electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceRepository.java

@@ -12,4 +12,10 @@ public interface ElectricityPriceRepository extends JpaRepository<ElectricityPri
     @Modifying
     @Query(value = "DELETE FROM electricityprices WHERE company_id = ?1", nativeQuery = true)
     void deleteCompany(Long companyId);
+
+    @Query(value = "SELECT AVG(price_low_tariff) FROM electricityprices", nativeQuery = true)
+    double averagePriceLowTariff();
+
+    @Query(value = "SELECT AVG(price_high_tariff) FROM electricityprices", nativeQuery = true)
+    double averagePriceHighTariff();
 }

electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceService.java

@@ -8,6 +8,10 @@ import org.springframework.data.domain.Pageable;
 import java.util.List;
 
 public interface ElectricityPriceService {
+  double averagePriceLowTariff();
+
+  public double averagePriceHighTariff();
+
   ElectricityPriceGetFullDto getElectricityPriceObj(Long companyId);
   double getElectricityPrice(Long companyId); // dependent on time - low or high tariff
 

electricityTarifMicroservice/src/main/java/cz/muni/fi/pa165/microservice4/electricityprices/ElectricityPriceServiceImpl.java

@@ -7,7 +7,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.ExceptionHandler;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
@@ -95,5 +94,15 @@ public class ElectricityPriceServiceImpl implements ElectricityPriceService {
     return electricityPriceRepository.save(mapStructMapper.electricityPricePostDtoToElectricityPrice(req));
   }
 
+  @Override
+  @Transactional(readOnly = true)
+  public double averagePriceHighTariff() {
+    return electricityPriceRepository.averagePriceHighTariff();
+  }
 
+  @Override
+  @Transactional(readOnly = true)
+  public double averagePriceLowTariff() {
+    return electricityPriceRepository.averagePriceLowTariff();
+  }
 }