From 13fb5a96b5963ec633fe4fbb5a41034a7f6c0f6e Mon Sep 17 00:00:00 2001
From: Oto Stanko <493068@fi.muni.cz>
Date: Thu, 13 Apr 2023 21:17:46 +0200
Subject: [PATCH] Minor changes in some services, nothing significant
---
.../muni/pa165/car/api/CarComponentDto.java | 29 ------------------
.../car/rest/CarComponentPairController.java | 4 +--
.../cz/muni/pa165/car/rest/CarController.java | 2 +-
.../car/rest/CarDriverPairController.java | 4 +--
.../car/service/CarComponentPairService.java | 4 +--
.../service/CarComponentPairServiceImpl.java | 7 +++--
.../car/service/CarDriverPairService.java | 4 +--
.../car/service/CarDriverPairServiceImpl.java | 4 +--
.../cz/muni/pa165/car/service/CarService.java | 2 +-
.../pa165/car/service/CarServiceImpl.java | 2 +-
.../common_library/dtos}/CarComponentDto.java | 4 +--
.../pa165/common_library/dtos}/CarDto.java | 2 +-
.../common_library/dtos}/DriverCarDto.java | 2 +-
.../pa165/common_library/dtos}/DriverDto.java | 2 +-
.../dtos}/DriverInsightDto.java | 2 +-
.../dtos}/DriverResponseDto.java | 2 +-
.../common_library/dtos}/DriverUpdateDto.java | 2 +-
.../pa165/common_library/dtos}/RaceDto.java | 2 +-
.../common_library/dtos}/RaceNameDto.java | 2 +-
.../pa165/common_library/dtos}/SeasonDto.java | 2 +-
common_library/src/main/resources.mv.db | Bin 45056 -> 40960 bytes
.../component/rest/ComponentController.java | 2 +-
.../component/service/ComponentService.java | 4 ++-
.../service/ComponentServiceInterface.java | 2 +-
.../pa165/driver/mapper/DriverCarMapper.java | 2 +-
.../driver/mapper/DriverCarMapperImpl.java | 2 +-
.../pa165/driver/mapper/DriverMapper.java | 6 ++--
.../pa165/driver/mapper/DriverMapperImpl.java | 6 ++--
.../pa165/driver/rest/DriverController.java | 8 ++---
.../muni/pa165/driver/service/CarService.java | 2 +-
.../pa165/driver/service/CarServiceImpl.java | 2 +-
.../pa165/driver/service/DriverService.java | 6 ++--
.../driver/service/DriverServiceImpl.java | 6 ++--
.../cz/muni/pa165/race/api/DriverCarDto.java | 25 ---------------
.../muni/pa165/race/rest/RaceController.java | 2 +-
.../pa165/race/rest/SeasonController.java | 3 +-
.../muni/pa165/race/service/RaceService.java | 2 +-
.../pa165/race/service/SeasonService.java | 4 +--
.../race/service/SeasonServiceInterface.java | 2 +-
39 files changed, 60 insertions(+), 110 deletions(-)
delete mode 100644 car/src/main/java/cz/muni/pa165/car/api/CarComponentDto.java
rename {component/src/main/java/cz/muni/pa165/component/api => common_library/src/main/java/cz/muni/pa165/common_library/dtos}/CarComponentDto.java (93%)
rename {car/src/main/java/cz/muni/pa165/car/api => common_library/src/main/java/cz/muni/pa165/common_library/dtos}/CarDto.java (95%)
rename {driver/src/main/java/cz/muni/pa165/driver/api => common_library/src/main/java/cz/muni/pa165/common_library/dtos}/DriverCarDto.java (74%)
rename {car/src/main/java/cz/muni/pa165/car/api => common_library/src/main/java/cz/muni/pa165/common_library/dtos}/DriverDto.java (93%)
rename {driver/src/main/java/cz/muni/pa165/driver/api => common_library/src/main/java/cz/muni/pa165/common_library/dtos}/DriverInsightDto.java (89%)
rename {driver/src/main/java/cz/muni/pa165/driver/api => common_library/src/main/java/cz/muni/pa165/common_library/dtos}/DriverResponseDto.java (65%)
rename {driver/src/main/java/cz/muni/pa165/driver/api => common_library/src/main/java/cz/muni/pa165/common_library/dtos}/DriverUpdateDto.java (86%)
rename {race/src/main/java/cz/muni/pa165/race/api => common_library/src/main/java/cz/muni/pa165/common_library/dtos}/RaceDto.java (95%)
rename {race/src/main/java/cz/muni/pa165/race/api => common_library/src/main/java/cz/muni/pa165/common_library/dtos}/RaceNameDto.java (93%)
rename {race/src/main/java/cz/muni/pa165/race/api => common_library/src/main/java/cz/muni/pa165/common_library/dtos}/SeasonDto.java (94%)
delete mode 100644 race/src/main/java/cz/muni/pa165/race/api/DriverCarDto.java
diff --git a/car/src/main/java/cz/muni/pa165/car/api/CarComponentDto.java b/car/src/main/java/cz/muni/pa165/car/api/CarComponentDto.java
deleted file mode 100644
index f24bb966..00000000
--- a/car/src/main/java/cz/muni/pa165/car/api/CarComponentDto.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cz.muni.pa165.car.api;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Data Transfer object for CarComponent class.
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class CarComponentDto {
-
- @NotNull
- @Schema(description = "component id",
- example = "1")
- Long id;
-
- @NotNull
- @Schema(description = "component name",
- example = "Default engine")
- String name;
-
-}
diff --git a/car/src/main/java/cz/muni/pa165/car/rest/CarComponentPairController.java b/car/src/main/java/cz/muni/pa165/car/rest/CarComponentPairController.java
index 1ef67e4b..0caf0872 100644
--- a/car/src/main/java/cz/muni/pa165/car/rest/CarComponentPairController.java
+++ b/car/src/main/java/cz/muni/pa165/car/rest/CarComponentPairController.java
@@ -1,7 +1,7 @@
package cz.muni.pa165.car.rest;
-import cz.muni.pa165.car.api.CarComponentDto;
-import cz.muni.pa165.car.api.CarDto;
+import cz.muni.pa165.common_library.dtos.CarComponentDto;
+import cz.muni.pa165.common_library.dtos.CarDto;
import cz.muni.pa165.car.service.CarComponentPairService;
import io.swagger.v3.oas.annotations.Operation;
import java.util.List;
diff --git a/car/src/main/java/cz/muni/pa165/car/rest/CarController.java b/car/src/main/java/cz/muni/pa165/car/rest/CarController.java
index e3d2b3e7..b131db11 100644
--- a/car/src/main/java/cz/muni/pa165/car/rest/CarController.java
+++ b/car/src/main/java/cz/muni/pa165/car/rest/CarController.java
@@ -1,6 +1,6 @@
package cz.muni.pa165.car.rest;
-import cz.muni.pa165.car.api.CarDto;
+import cz.muni.pa165.common_library.dtos.CarDto;
import cz.muni.pa165.car.service.CarService;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.Valid;
diff --git a/car/src/main/java/cz/muni/pa165/car/rest/CarDriverPairController.java b/car/src/main/java/cz/muni/pa165/car/rest/CarDriverPairController.java
index 2c32e1bd..3d2cd3d8 100644
--- a/car/src/main/java/cz/muni/pa165/car/rest/CarDriverPairController.java
+++ b/car/src/main/java/cz/muni/pa165/car/rest/CarDriverPairController.java
@@ -1,7 +1,7 @@
package cz.muni.pa165.car.rest;
-import cz.muni.pa165.car.api.CarDto;
-import cz.muni.pa165.car.api.DriverDto;
+import cz.muni.pa165.common_library.dtos.CarDto;
+import cz.muni.pa165.common_library.dtos.DriverDto;
import cz.muni.pa165.car.service.CarDriverPairService;
import io.swagger.v3.oas.annotations.Operation;
import java.util.List;
diff --git a/car/src/main/java/cz/muni/pa165/car/service/CarComponentPairService.java b/car/src/main/java/cz/muni/pa165/car/service/CarComponentPairService.java
index 28b96cc5..5bd94c3d 100644
--- a/car/src/main/java/cz/muni/pa165/car/service/CarComponentPairService.java
+++ b/car/src/main/java/cz/muni/pa165/car/service/CarComponentPairService.java
@@ -1,7 +1,7 @@
package cz.muni.pa165.car.service;
-import cz.muni.pa165.car.api.CarComponentDto;
-import cz.muni.pa165.car.api.CarDto;
+import cz.muni.pa165.common_library.dtos.CarComponentDto;
+import cz.muni.pa165.common_library.dtos.CarDto;
import java.util.List;
/**
diff --git a/car/src/main/java/cz/muni/pa165/car/service/CarComponentPairServiceImpl.java b/car/src/main/java/cz/muni/pa165/car/service/CarComponentPairServiceImpl.java
index 5af15453..b82bae6e 100644
--- a/car/src/main/java/cz/muni/pa165/car/service/CarComponentPairServiceImpl.java
+++ b/car/src/main/java/cz/muni/pa165/car/service/CarComponentPairServiceImpl.java
@@ -1,7 +1,7 @@
package cz.muni.pa165.car.service;
-import cz.muni.pa165.car.api.CarComponentDto;
-import cz.muni.pa165.car.api.CarDto;
+import cz.muni.pa165.common_library.dtos.CarComponentDto;
+import cz.muni.pa165.common_library.dtos.CarDto;
import cz.muni.pa165.car.data.repository.CarComponentPairRepository;
import cz.muni.pa165.car.data.repository.CarComponentRepository;
import cz.muni.pa165.car.data.repository.CarRepository;
@@ -74,6 +74,9 @@ public class CarComponentPairServiceImpl implements CarComponentPairService {
componentDtos.add(
new CarComponentDto(
c.getId(),
+ c.getWeight(),
+ c.getPrice(),
+ c.getManufacturer(),
c.getName()
)
);
diff --git a/car/src/main/java/cz/muni/pa165/car/service/CarDriverPairService.java b/car/src/main/java/cz/muni/pa165/car/service/CarDriverPairService.java
index 6136d573..edc59822 100644
--- a/car/src/main/java/cz/muni/pa165/car/service/CarDriverPairService.java
+++ b/car/src/main/java/cz/muni/pa165/car/service/CarDriverPairService.java
@@ -1,7 +1,7 @@
package cz.muni.pa165.car.service;
-import cz.muni.pa165.car.api.CarDto;
-import cz.muni.pa165.car.api.DriverDto;
+import cz.muni.pa165.common_library.dtos.CarDto;
+import cz.muni.pa165.common_library.dtos.DriverDto;
import java.util.List;
/**
diff --git a/car/src/main/java/cz/muni/pa165/car/service/CarDriverPairServiceImpl.java b/car/src/main/java/cz/muni/pa165/car/service/CarDriverPairServiceImpl.java
index 2898d7ac..98af28eb 100644
--- a/car/src/main/java/cz/muni/pa165/car/service/CarDriverPairServiceImpl.java
+++ b/car/src/main/java/cz/muni/pa165/car/service/CarDriverPairServiceImpl.java
@@ -1,7 +1,7 @@
package cz.muni.pa165.car.service;
-import cz.muni.pa165.car.api.CarDto;
-import cz.muni.pa165.car.api.DriverDto;
+import cz.muni.pa165.common_library.dtos.CarDto;
+import cz.muni.pa165.common_library.dtos.DriverDto;
import cz.muni.pa165.car.data.repository.CarDriverPairRepository;
import cz.muni.pa165.car.data.repository.CarRepository;
import cz.muni.pa165.car.data.repository.DriverRepository;
diff --git a/car/src/main/java/cz/muni/pa165/car/service/CarService.java b/car/src/main/java/cz/muni/pa165/car/service/CarService.java
index 688ba89e..7fe1dbf0 100644
--- a/car/src/main/java/cz/muni/pa165/car/service/CarService.java
+++ b/car/src/main/java/cz/muni/pa165/car/service/CarService.java
@@ -1,6 +1,6 @@
package cz.muni.pa165.car.service;
-import cz.muni.pa165.car.api.CarDto;
+import cz.muni.pa165.common_library.dtos.CarDto;
import java.util.List;
/**
diff --git a/car/src/main/java/cz/muni/pa165/car/service/CarServiceImpl.java b/car/src/main/java/cz/muni/pa165/car/service/CarServiceImpl.java
index ac139999..0033fc93 100644
--- a/car/src/main/java/cz/muni/pa165/car/service/CarServiceImpl.java
+++ b/car/src/main/java/cz/muni/pa165/car/service/CarServiceImpl.java
@@ -1,6 +1,6 @@
package cz.muni.pa165.car.service;
-import cz.muni.pa165.car.api.CarDto;
+import cz.muni.pa165.common_library.dtos.CarDto;
import cz.muni.pa165.car.data.repository.CarComponentRepository;
import cz.muni.pa165.car.data.repository.CarRepository;
import cz.muni.pa165.car.data.repository.DriverRepository;
diff --git a/component/src/main/java/cz/muni/pa165/component/api/CarComponentDto.java b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/CarComponentDto.java
similarity index 93%
rename from component/src/main/java/cz/muni/pa165/component/api/CarComponentDto.java
rename to common_library/src/main/java/cz/muni/pa165/common_library/dtos/CarComponentDto.java
index 692adccb..f34f2303 100644
--- a/component/src/main/java/cz/muni/pa165/component/api/CarComponentDto.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/CarComponentDto.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.component.api;
+package cz.muni.pa165.common_library.dtos;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
@@ -19,7 +19,7 @@ public class CarComponentDto {
@NotNull
@Schema(description = "component id", example = "1")
- long id;
+ Long id;
@NotNull
@Schema(description = "component weight", example = "50")
diff --git a/car/src/main/java/cz/muni/pa165/car/api/CarDto.java b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/CarDto.java
similarity index 95%
rename from car/src/main/java/cz/muni/pa165/car/api/CarDto.java
rename to common_library/src/main/java/cz/muni/pa165/common_library/dtos/CarDto.java
index 309a567e..1b9ce2fa 100644
--- a/car/src/main/java/cz/muni/pa165/car/api/CarDto.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/CarDto.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.car.api;
+package cz.muni.pa165.common_library.dtos;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/driver/src/main/java/cz/muni/pa165/driver/api/DriverCarDto.java b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverCarDto.java
similarity index 74%
rename from driver/src/main/java/cz/muni/pa165/driver/api/DriverCarDto.java
rename to common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverCarDto.java
index 869575aa..316990e2 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/api/DriverCarDto.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverCarDto.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.driver.api;
+package cz.muni.pa165.common_library.dtos;
/**
* Dto for DriverCar response.
diff --git a/car/src/main/java/cz/muni/pa165/car/api/DriverDto.java b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverDto.java
similarity index 93%
rename from car/src/main/java/cz/muni/pa165/car/api/DriverDto.java
rename to common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverDto.java
index 3c2a8728..c7d00367 100644
--- a/car/src/main/java/cz/muni/pa165/car/api/DriverDto.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverDto.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.car.api;
+package cz.muni.pa165.common_library.dtos;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/driver/src/main/java/cz/muni/pa165/driver/api/DriverInsightDto.java b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverInsightDto.java
similarity index 89%
rename from driver/src/main/java/cz/muni/pa165/driver/api/DriverInsightDto.java
rename to common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverInsightDto.java
index bc5325e3..3525965a 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/api/DriverInsightDto.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverInsightDto.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.driver.api;
+package cz.muni.pa165.common_library.dtos;
import java.util.Map;
diff --git a/driver/src/main/java/cz/muni/pa165/driver/api/DriverResponseDto.java b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverResponseDto.java
similarity index 65%
rename from driver/src/main/java/cz/muni/pa165/driver/api/DriverResponseDto.java
rename to common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverResponseDto.java
index e7f27ccd..e05bb898 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/api/DriverResponseDto.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverResponseDto.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.driver.api;
+package cz.muni.pa165.common_library.dtos;
/**
* Dto for driver response.
diff --git a/driver/src/main/java/cz/muni/pa165/driver/api/DriverUpdateDto.java b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverUpdateDto.java
similarity index 86%
rename from driver/src/main/java/cz/muni/pa165/driver/api/DriverUpdateDto.java
rename to common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverUpdateDto.java
index f9025444..4c574b86 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/api/DriverUpdateDto.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/DriverUpdateDto.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.driver.api;
+package cz.muni.pa165.common_library.dtos;
import java.util.Map;
diff --git a/race/src/main/java/cz/muni/pa165/race/api/RaceDto.java b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/RaceDto.java
similarity index 95%
rename from race/src/main/java/cz/muni/pa165/race/api/RaceDto.java
rename to common_library/src/main/java/cz/muni/pa165/common_library/dtos/RaceDto.java
index 71a72fca..0c26d22f 100644
--- a/race/src/main/java/cz/muni/pa165/race/api/RaceDto.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/RaceDto.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.race.api;
+package cz.muni.pa165.common_library.dtos;
import cz.muni.pa165.common_library.racecomponents.Location;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/race/src/main/java/cz/muni/pa165/race/api/RaceNameDto.java b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/RaceNameDto.java
similarity index 93%
rename from race/src/main/java/cz/muni/pa165/race/api/RaceNameDto.java
rename to common_library/src/main/java/cz/muni/pa165/common_library/dtos/RaceNameDto.java
index 71c6c9d3..31e71ad9 100644
--- a/race/src/main/java/cz/muni/pa165/race/api/RaceNameDto.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/RaceNameDto.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.race.api;
+package cz.muni.pa165.common_library.dtos;
import cz.muni.pa165.common_library.racecomponents.Location;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/race/src/main/java/cz/muni/pa165/race/api/SeasonDto.java b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/SeasonDto.java
similarity index 94%
rename from race/src/main/java/cz/muni/pa165/race/api/SeasonDto.java
rename to common_library/src/main/java/cz/muni/pa165/common_library/dtos/SeasonDto.java
index 8da65bb6..f5ea5df1 100644
--- a/race/src/main/java/cz/muni/pa165/race/api/SeasonDto.java
+++ b/common_library/src/main/java/cz/muni/pa165/common_library/dtos/SeasonDto.java
@@ -1,4 +1,4 @@
-package cz.muni.pa165.race.api;
+package cz.muni.pa165.common_library.dtos;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Max;
diff --git a/common_library/src/main/resources.mv.db b/common_library/src/main/resources.mv.db
index 9b1b72eccb39842839946971a1bea703e1e1f73b..2d0ad96b2093300a24f932e16ea0a59b9c26972f 100644
GIT binary patch
delta 1416
zcmbVMU1%dk9G{uZCTaSSJDXnmX``NL)$Mh6Hpy;Qgo<w`9<7J<rO?~V&U&T2q_k<d
z!_uU8P&pO3_AltuNj+33s8{lKD%7Wg13`Qg6v2mk65j>U*~zAfC<@NQ{%6_$%>4HE
zG4-EF{g~W(j8J{=iR=K?HGhRy*=4@w7%tCq&aA|d`#}<ZPoDknp7E}<*rBviVapEH
zR(RPlv@7naLtVJEJ*L^Z9NaT<T6O6PcZ^c5;M$(8ZSuACrApZmtE&~}Sk!`}=@;V(
zgzzN3hZ^^HpTr9K88?1?;|x~FEP?pVx}ww+c<W|%SUHRgs0bs16cj-!5<^)>4^`9)
zJ=u{2kF(1g<>hmR594z$kdN^GOd4L@8i5b9h0!L4f@^6T<&AajJzt#<u^1d?_A-ho
z`s-<UbRrImTmA6c!4SN1XDnP7VE@}XAGYs|_xS#&Sf1;Mjh;Dpszw7Yt~v(Qb*;>=
zRvlMcbzkG_j;XCxDpkjl^qAE83p+Wh5T5XFNKXhfxFpc`ZLPxC#;RLp*BsqCz^oQ<
z;23@=k1OTLX)8;c{3QX)H1oQAnU$EVP&WzLw8S?FnTL?=5Hbq{ExE;Fr=b5xreAAg
z^d&}<iXUx*v~_HBTXMr<(X`F(&@Cm#+}7OlY}%T0(Hr*blojo8PN|_Atscs3-kJ*{
zZ7z&aM@V}|)MJD;MU4oveE9%L*Zgo@)ER^xif_UAB?X`Hr(yQ`6l{5CPwL_>dk&4o
zcd?2wLa}2+CKqH?-(46S9zv-1uG&Y`L4=7CQKPYVSE9S8w=a3>^dtSLfivmB#-jgK
zbgF5Nj=Xe);3R~_qEGFTYl=8rfO;m<_+vV*U*e&N1t}tJYW2VE)jGHB9dX+Eln7t+
zz38)u454_QvRuJ5b8xTza?J95&hsu{cN&U27vO7e4)hz@#`inl;1)@ZPi~ATs(O(`
zFzjqjrBrbZoTE|s)SJa<B;Nd(#G++a+ysko_w8})!MDM)@%gnO(nobd4I$J*@<$?*
zJlfR?vKIsyma|{L`RxIizZFDsQmhuaBg}x?6Nlsw?`P8R`rHVNW(totGulj0J5e23
z_h2s5KipwQ-3;s~J!p6|59PgVqWK!Q4Q}sgr{5PAnL+rwd1)49B6Z}hCigS3Y+IfV
TYEL9(g}hnvy;57!8qWL)7Br#j
delta 684
zcmaixO=}ZT6o&7;ZQ5zlF!iI+qBTj|1jI3!J0_E6C^qU+kd!X$c5>&&h9)!8)`Dnp
zibWI(`8W_n3oZp+*f0wzeo$Np#f|t2bnD7LP<1B6Bs<UUat`Ob&vWeqVt*&KD4|Au
zIzCPfsaWRgY?-fWS;e4fm8t%g{z8N!apu1>oAZ9rkP2mst!Ro==B7sBv^95pgRicY
zEcazd>lV{ybsbvC>w+I4-=gm~g01Eyfe%&m+X-59-Z#Gx%;4)z7&GVBPLu>Wp+$tq
z%fWq&M&ZNs8Mhr?xCX(>JCRXYDwj5RUcbfHG!^o-FigZI;aM#Jhh_lIn;|Si&U_Wb
zG>}QjUMY-%Szij~5RyX3D{Oyj>7R$do*$0)0QzEgrLeTZ3fxd#fE!>(2Aw}iK^8L|
zXtfQk!0W0Cq;|p^8jVCe&L_SEBIB@chvA341Xs6yI*$uCu_GHv?CkO9*f(}1WMSuR
zZf?xE-wcezdpo;1GJT(;rn6b98@(J4aHNqN7Fj2X-tljmeg0Y7e@dpFf4`e+U}4}0
zp&*>Ao*fa`@*Q&}K?`lUo7H2m9h-u^>O-tRes`)7n*gg;0x>7R<rx7ImAm9AZrG>b
zpd!G%#V7<~7d-FSU0{aEtPFac`&_%yNzk_^oj1lVaXvlzC|qnG(r7Pgmyq=cSz6T#
KTu%KX#Qwi&y5DL5
diff --git a/component/src/main/java/cz/muni/pa165/component/rest/ComponentController.java b/component/src/main/java/cz/muni/pa165/component/rest/ComponentController.java
index 59372694..d4d15522 100644
--- a/component/src/main/java/cz/muni/pa165/component/rest/ComponentController.java
+++ b/component/src/main/java/cz/muni/pa165/component/rest/ComponentController.java
@@ -1,6 +1,6 @@
package cz.muni.pa165.component.rest;
-import cz.muni.pa165.component.api.CarComponentDto;
+import cz.muni.pa165.common_library.dtos.CarComponentDto;
import cz.muni.pa165.component.service.ComponentServiceInterface;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.Valid;
diff --git a/component/src/main/java/cz/muni/pa165/component/service/ComponentService.java b/component/src/main/java/cz/muni/pa165/component/service/ComponentService.java
index e537ca6d..e2ef17c8 100644
--- a/component/src/main/java/cz/muni/pa165/component/service/ComponentService.java
+++ b/component/src/main/java/cz/muni/pa165/component/service/ComponentService.java
@@ -2,7 +2,7 @@ package cz.muni.pa165.component.service;
import cz.muni.pa165.common_library.exceptions.DatabaseException;
import cz.muni.pa165.common_library.racecomponents.CarComponent;
-import cz.muni.pa165.component.api.CarComponentDto;
+import cz.muni.pa165.common_library.dtos.CarComponentDto;
import cz.muni.pa165.component.data.repository.ComponentRepositoryInterface;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -67,6 +67,7 @@ public class ComponentService implements ComponentServiceInterface {
.weight(carComponentDto.getWeight())
.price(carComponentDto.getPrice())
.manufacturer(carComponentDto.getManufacturer())
+ .name(carComponentDto.getName())
.build();
}
@@ -76,6 +77,7 @@ public class ComponentService implements ComponentServiceInterface {
.weight(carComponent.getWeight())
.price(carComponent.getPrice())
.manufacturer(carComponent.getManufacturer())
+ .name(carComponent.getName())
.build();
}
}
diff --git a/component/src/main/java/cz/muni/pa165/component/service/ComponentServiceInterface.java b/component/src/main/java/cz/muni/pa165/component/service/ComponentServiceInterface.java
index 1eefb297..4ce60cfe 100644
--- a/component/src/main/java/cz/muni/pa165/component/service/ComponentServiceInterface.java
+++ b/component/src/main/java/cz/muni/pa165/component/service/ComponentServiceInterface.java
@@ -1,6 +1,6 @@
package cz.muni.pa165.component.service;
-import cz.muni.pa165.component.api.CarComponentDto;
+import cz.muni.pa165.common_library.dtos.CarComponentDto;
import java.util.List;
diff --git a/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverCarMapper.java b/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverCarMapper.java
index 2362d549..374ea886 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverCarMapper.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverCarMapper.java
@@ -2,7 +2,7 @@ package cz.muni.pa165.driver.mapper;
import cz.muni.pa165.common_library.racecomponents.Car;
import cz.muni.pa165.common_library.racecomponents.Driver;
-import cz.muni.pa165.driver.api.DriverCarDto;
+import cz.muni.pa165.common_library.dtos.DriverCarDto;
/**
* Interface of driver car mapper.
diff --git a/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverCarMapperImpl.java b/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverCarMapperImpl.java
index 0f9b3eb9..591144e3 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverCarMapperImpl.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverCarMapperImpl.java
@@ -2,7 +2,7 @@ package cz.muni.pa165.driver.mapper;
import cz.muni.pa165.common_library.racecomponents.Car;
import cz.muni.pa165.common_library.racecomponents.Driver;
-import cz.muni.pa165.driver.api.DriverCarDto;
+import cz.muni.pa165.common_library.dtos.DriverCarDto;
import org.springframework.stereotype.Component;
/**
diff --git a/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverMapper.java b/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverMapper.java
index 67215558..aaaa76aa 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverMapper.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverMapper.java
@@ -1,9 +1,9 @@
package cz.muni.pa165.driver.mapper;
import cz.muni.pa165.common_library.racecomponents.Driver;
-import cz.muni.pa165.driver.api.DriverInsightDto;
-import cz.muni.pa165.driver.api.DriverResponseDto;
-import cz.muni.pa165.driver.api.DriverUpdateDto;
+import cz.muni.pa165.common_library.dtos.DriverInsightDto;
+import cz.muni.pa165.common_library.dtos.DriverResponseDto;
+import cz.muni.pa165.common_library.dtos.DriverUpdateDto;
/**
* Interface for driver mapper.
diff --git a/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverMapperImpl.java b/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverMapperImpl.java
index cb9b0430..ae66d10a 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverMapperImpl.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/mapper/DriverMapperImpl.java
@@ -1,9 +1,9 @@
package cz.muni.pa165.driver.mapper;
import cz.muni.pa165.common_library.racecomponents.Driver;
-import cz.muni.pa165.driver.api.DriverInsightDto;
-import cz.muni.pa165.driver.api.DriverResponseDto;
-import cz.muni.pa165.driver.api.DriverUpdateDto;
+import cz.muni.pa165.common_library.dtos.DriverInsightDto;
+import cz.muni.pa165.common_library.dtos.DriverResponseDto;
+import cz.muni.pa165.common_library.dtos.DriverUpdateDto;
import org.springframework.stereotype.Component;
/**
diff --git a/driver/src/main/java/cz/muni/pa165/driver/rest/DriverController.java b/driver/src/main/java/cz/muni/pa165/driver/rest/DriverController.java
index 56b842dd..b9608e02 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/rest/DriverController.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/rest/DriverController.java
@@ -1,9 +1,9 @@
package cz.muni.pa165.driver.rest;
-import cz.muni.pa165.driver.api.DriverCarDto;
-import cz.muni.pa165.driver.api.DriverInsightDto;
-import cz.muni.pa165.driver.api.DriverResponseDto;
-import cz.muni.pa165.driver.api.DriverUpdateDto;
+import cz.muni.pa165.common_library.dtos.DriverCarDto;
+import cz.muni.pa165.common_library.dtos.DriverInsightDto;
+import cz.muni.pa165.common_library.dtos.DriverResponseDto;
+import cz.muni.pa165.common_library.dtos.DriverUpdateDto;
import cz.muni.pa165.driver.service.CarService;
import cz.muni.pa165.driver.service.DriverService;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/driver/src/main/java/cz/muni/pa165/driver/service/CarService.java b/driver/src/main/java/cz/muni/pa165/driver/service/CarService.java
index 8c2260c2..95698d97 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/service/CarService.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/service/CarService.java
@@ -1,6 +1,6 @@
package cz.muni.pa165.driver.service;
-import cz.muni.pa165.driver.api.DriverCarDto;
+import cz.muni.pa165.common_library.dtos.DriverCarDto;
/**
* Car service interface.
diff --git a/driver/src/main/java/cz/muni/pa165/driver/service/CarServiceImpl.java b/driver/src/main/java/cz/muni/pa165/driver/service/CarServiceImpl.java
index a938d740..9a1e10df 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/service/CarServiceImpl.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/service/CarServiceImpl.java
@@ -1,7 +1,7 @@
package cz.muni.pa165.driver.service;
import cz.muni.pa165.common_library.exceptions.ResourceNotFoundException;
-import cz.muni.pa165.driver.api.DriverCarDto;
+import cz.muni.pa165.common_library.dtos.DriverCarDto;
import cz.muni.pa165.driver.data.repository.CarRepository;
import cz.muni.pa165.driver.data.repository.DriverRepository;
import cz.muni.pa165.driver.mapper.DriverCarMapper;
diff --git a/driver/src/main/java/cz/muni/pa165/driver/service/DriverService.java b/driver/src/main/java/cz/muni/pa165/driver/service/DriverService.java
index 3f31ded7..90aea4b7 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/service/DriverService.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/service/DriverService.java
@@ -1,8 +1,8 @@
package cz.muni.pa165.driver.service;
-import cz.muni.pa165.driver.api.DriverInsightDto;
-import cz.muni.pa165.driver.api.DriverResponseDto;
-import cz.muni.pa165.driver.api.DriverUpdateDto;
+import cz.muni.pa165.common_library.dtos.DriverInsightDto;
+import cz.muni.pa165.common_library.dtos.DriverResponseDto;
+import cz.muni.pa165.common_library.dtos.DriverUpdateDto;
import java.util.List;
/**
diff --git a/driver/src/main/java/cz/muni/pa165/driver/service/DriverServiceImpl.java b/driver/src/main/java/cz/muni/pa165/driver/service/DriverServiceImpl.java
index 4f981b20..4e884f00 100644
--- a/driver/src/main/java/cz/muni/pa165/driver/service/DriverServiceImpl.java
+++ b/driver/src/main/java/cz/muni/pa165/driver/service/DriverServiceImpl.java
@@ -1,9 +1,9 @@
package cz.muni.pa165.driver.service;
import cz.muni.pa165.common_library.exceptions.ResourceNotFoundException;
-import cz.muni.pa165.driver.api.DriverInsightDto;
-import cz.muni.pa165.driver.api.DriverResponseDto;
-import cz.muni.pa165.driver.api.DriverUpdateDto;
+import cz.muni.pa165.common_library.dtos.DriverInsightDto;
+import cz.muni.pa165.common_library.dtos.DriverResponseDto;
+import cz.muni.pa165.common_library.dtos.DriverUpdateDto;
import cz.muni.pa165.driver.data.repository.DriverRepository;
import cz.muni.pa165.driver.mapper.DriverMapper;
import java.util.List;
diff --git a/race/src/main/java/cz/muni/pa165/race/api/DriverCarDto.java b/race/src/main/java/cz/muni/pa165/race/api/DriverCarDto.java
deleted file mode 100644
index f61f9b34..00000000
--- a/race/src/main/java/cz/muni/pa165/race/api/DriverCarDto.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cz.muni.pa165.race.api;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Builder;
-import lombok.Data;
-
-/**
- * Dto fro DriverCar entity.
- */
-@Data
-@Builder
-public class DriverCarDto {
-
- @NotNull
- @Schema(description = "driver id", example = "1")
- Long driverId;
-
- @NotNull
- @Schema(description = "car id", example = "1")
- Long carId;
-
- @Schema(description = "driver name", example = "1")
- String driverName;
-}
diff --git a/race/src/main/java/cz/muni/pa165/race/rest/RaceController.java b/race/src/main/java/cz/muni/pa165/race/rest/RaceController.java
index 05a9e34a..24ce9dd8 100644
--- a/race/src/main/java/cz/muni/pa165/race/rest/RaceController.java
+++ b/race/src/main/java/cz/muni/pa165/race/rest/RaceController.java
@@ -1,7 +1,7 @@
package cz.muni.pa165.race.rest;
-import cz.muni.pa165.race.api.RaceDto;
+import cz.muni.pa165.common_library.dtos.RaceDto;
import cz.muni.pa165.race.service.RaceService;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.Valid;
diff --git a/race/src/main/java/cz/muni/pa165/race/rest/SeasonController.java b/race/src/main/java/cz/muni/pa165/race/rest/SeasonController.java
index bdfd5e08..b3ced6ad 100644
--- a/race/src/main/java/cz/muni/pa165/race/rest/SeasonController.java
+++ b/race/src/main/java/cz/muni/pa165/race/rest/SeasonController.java
@@ -1,7 +1,6 @@
package cz.muni.pa165.race.rest;
-import cz.muni.pa165.common_library.racecomponents.Season;
-import cz.muni.pa165.race.api.SeasonDto;
+import cz.muni.pa165.common_library.dtos.SeasonDto;
import cz.muni.pa165.race.service.SeasonServiceInterface;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.Valid;
diff --git a/race/src/main/java/cz/muni/pa165/race/service/RaceService.java b/race/src/main/java/cz/muni/pa165/race/service/RaceService.java
index ece7fd21..ebb149d2 100644
--- a/race/src/main/java/cz/muni/pa165/race/service/RaceService.java
+++ b/race/src/main/java/cz/muni/pa165/race/service/RaceService.java
@@ -5,7 +5,7 @@ import cz.muni.pa165.common_library.racecomponents.Car;
import cz.muni.pa165.common_library.racecomponents.Driver;
import cz.muni.pa165.common_library.racecomponents.Race;
import cz.muni.pa165.race.api.DriverCarDto;
-import cz.muni.pa165.race.api.RaceDto;
+import cz.muni.pa165.common_library.dtos.RaceDto;
import cz.muni.pa165.race.data.repository.CarRepository;
import cz.muni.pa165.race.data.repository.DriverRepository;
import cz.muni.pa165.race.data.repository.RaceRepository;
diff --git a/race/src/main/java/cz/muni/pa165/race/service/SeasonService.java b/race/src/main/java/cz/muni/pa165/race/service/SeasonService.java
index eea02cc5..26f6637a 100644
--- a/race/src/main/java/cz/muni/pa165/race/service/SeasonService.java
+++ b/race/src/main/java/cz/muni/pa165/race/service/SeasonService.java
@@ -3,8 +3,8 @@ package cz.muni.pa165.race.service;
import cz.muni.pa165.common_library.exceptions.DatabaseException;
import cz.muni.pa165.common_library.racecomponents.Race;
import cz.muni.pa165.common_library.racecomponents.Season;
-import cz.muni.pa165.race.api.RaceNameDto;
-import cz.muni.pa165.race.api.SeasonDto;
+import cz.muni.pa165.common_library.dtos.RaceNameDto;
+import cz.muni.pa165.common_library.dtos.SeasonDto;
import cz.muni.pa165.race.data.repository.RaceRepository;
import cz.muni.pa165.race.data.repository.SeasonRepository;
import java.util.List;
diff --git a/race/src/main/java/cz/muni/pa165/race/service/SeasonServiceInterface.java b/race/src/main/java/cz/muni/pa165/race/service/SeasonServiceInterface.java
index 5fc6a35a..62cf0c3b 100644
--- a/race/src/main/java/cz/muni/pa165/race/service/SeasonServiceInterface.java
+++ b/race/src/main/java/cz/muni/pa165/race/service/SeasonServiceInterface.java
@@ -1,6 +1,6 @@
package cz.muni.pa165.race.service;
-import cz.muni.pa165.race.api.SeasonDto;
+import cz.muni.pa165.common_library.dtos.SeasonDto;
import java.util.List;
/**
--
GitLab