[API] added changes to docker and code design

.env

@@ -1,6 +1,6 @@
 MYSQLDB_DATABASE=air_companies_management
 MYSQLDB_USER=root
-MYSQLDB_ROOT_PASSWORD=default
+MYSQLDB_ROOT_PASSWORD=root
 MYSQLDB_LOCAL_PORT=3308
 MYSQLDB_DOCKER_PORT=3306
 SPRING_LOCAL_PORT=8088

docker-compose.yml

@@ -9,7 +9,6 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=$MYSQLDB_ROOT_PASSWORD
       - MYSQL_DATABASE=$MYSQLDB_DATABASE
-      - MYSQL_ROOT_HOST="%"
     ports:
       - $MYSQLDB_LOCAL_PORT:$MYSQLDB_DOCKER_PORT
     healthcheck:

src/main/java/org/company/aircompaniesmanager/controller/AirCompanyController.java

@@ -10,13 +10,15 @@
 import org.company.aircompaniesmanager.dto.air.company.AirCompanyUpdateRequestDto;
 import org.company.aircompaniesmanager.service.air.company.AirCompanyService;
 import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -63,8 +65,8 @@ private AirCompanyResponseDto updateById(
     @DeleteMapping("/{id}")
     @Operation(summary = "Delete air company",
             description = "Removes air company")
-    private String deleteById(@PathVariable Long id) {
+    @ResponseStatus(value = HttpStatus.NO_CONTENT)
+    private void deleteById(@PathVariable Long id) {
         airCompanyService.deleteById(id);
-        return String.format("Company with id: '%s' deleted successfully.", id);
     }
 }

src/main/java/org/company/aircompaniesmanager/controller/AirplaneController.java

@@ -10,9 +10,9 @@
 import org.company.aircompaniesmanager.service.airplane.AirplaneService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -48,13 +48,13 @@ public AirplaneResponseDto save(@RequestBody AirplaneRequestDto requestDto) {
         return airplaneService.save(requestDto);
     }
 
-    @PutMapping("/{id}")
+    @PatchMapping("/{airplaneId}/move")
     @Operation(summary = "Reassign to another company",
             description = "Updates airplane company")
     public AirplaneResponseDto updateCompany(
-            @PathVariable Long id,
+            @PathVariable Long airplaneId,
             @RequestBody AirplaneUpdateRequestDto requestDto
     ) {
-        return airplaneService.updateCompany(id, requestDto);
+        return airplaneService.updateCompany(airplaneId, requestDto);
     }
 }

src/main/java/org/company/aircompaniesmanager/controller/FlightController.java

@@ -55,18 +55,18 @@ List<FlightResponseDto> findAllOverdue(Pageable pageable) {
         return flightService.findAllOverdue(pageable);
     }
 
-    @GetMapping("/{status}/company")
+    @GetMapping("/by-company-and-status")
     @Operation(
             summary = "Find flight by status and company",
             description = "Retrieves detailed information "
                     + "about flights by specified company with specified status"
     )
     List<FlightResponseDto> findAllByCompanyNameAndStatus(
             @RequestParam String name,
-            @PathVariable String status,
+            @RequestParam String status,
             Pageable pageable
     ) {
-        return flightService.findAllByCompanyName(name, status, pageable);
+        return flightService.findAllByCompanyAndStatus(name, status, pageable);
     }
 
     @GetMapping("/{id}")

src/main/java/org/company/aircompaniesmanager/model/AirCompany.java

@@ -20,12 +20,16 @@ public class AirCompany {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
     @Column(nullable = false, unique = true, length = 72)
     private String name;
+
     @Column(nullable = false, length = 56)
     private String companyType;
+
     @Column(nullable = false)
     private LocalDate foundationDate;
+
     @Column(name = "is_deleted", nullable = false, columnDefinition = "boolean default false")
     private boolean isDeleted = false;
 

src/main/java/org/company/aircompaniesmanager/model/Airplane.java

@@ -25,19 +25,25 @@ public class Airplane {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
     @Column(nullable = false, length = 12)
     private String factorySerialNumber;
+
     @ToString.Exclude
     @EqualsAndHashCode.Exclude
     @JoinColumn(name = "air_company_id")
     @ManyToOne(fetch = FetchType.LAZY)
     private AirCompany airCompany;
+
     private int numberOfFlights;
     private double flightDistance;
     private double fuelCapacity;
+
     @Column(nullable = false, length = 56)
     private String type;
+
     private LocalDate creationDate;
+
     @Column(name = "is_deleted", nullable = false, columnDefinition = "boolean default false")
     private boolean isDeleted = false;
 

src/main/java/org/company/aircompaniesmanager/model/Flight.java

@@ -27,31 +27,40 @@ public class Flight {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
     private Status status;
+
     @ToString.Exclude
     @EqualsAndHashCode.Exclude
     @JoinColumn(name = "air_company_id", nullable = false)
     @ManyToOne(fetch = FetchType.LAZY)
     private AirCompany airCompany;
+
     @ToString.Exclude
     @EqualsAndHashCode.Exclude
     @JoinColumn(name = "airplane_id", nullable = false)
     @ManyToOne(fetch = FetchType.LAZY)
     private Airplane airplane;
+
     @Column(nullable = false)
     private String departureCountry;
+
     @Column(nullable = false)
     private String destinationCountry;
+
     @Column(nullable = false)
     private double distance;
+
     @Column(nullable = false)
     private double estimatedTime;
+
     private LocalDateTime startTime;
     private LocalDateTime endTime;
     private LocalDateTime delayStartTime;
     private LocalDateTime creationDate;
+
     @Column(name = "is_deleted", nullable = false, columnDefinition = "boolean default false")
     private boolean isDeleted = false;
 

src/main/java/org/company/aircompaniesmanager/repository/AirCompanyRepository.java

@@ -8,6 +8,4 @@
 @Repository
 public interface AirCompanyRepository extends JpaRepository<AirCompany, Long> {
     Optional<AirCompany> findByName(String name);
-
-    void deleteByName(String name);
 }

src/main/java/org/company/aircompaniesmanager/repository/FlightRepository.java

@@ -16,7 +16,8 @@ public interface FlightRepository extends JpaRepository<Flight, Long> {
 
     @Query(
             value = "SELECT * FROM `air_companies_management`.`flights` "
-                    + "WHERE TIMESTAMPDIFF(minute, start_time, end_time) >= estimated_time",
+                    + "WHERE TIMESTAMPDIFF(minute, start_time, end_time) >= estimated_time "
+                    + "AND status = 'COMPLETED'",
             nativeQuery = true
     )
     List<Flight> findAllOverdue(Pageable pageable);

src/main/java/org/company/aircompaniesmanager/service/flight/FlightService.java

@@ -9,7 +9,7 @@
 public interface FlightService {
     List<FlightResponseDto> findAll(Pageable pageable);
 
-    List<FlightResponseDto> findAllByCompanyName(
+    List<FlightResponseDto> findAllByCompanyAndStatus(
             String companyName,
             String statusString,
             Pageable pageable

src/main/java/org/company/aircompaniesmanager/service/flight/FlightServiceImpl.java

@@ -37,7 +37,7 @@ public List<FlightResponseDto> findAll(Pageable pageable) {
     }
 
     @Override
-    public List<FlightResponseDto> findAllByCompanyName(
+    public List<FlightResponseDto> findAllByCompanyAndStatus(
             String name,
             String statusString,
             Pageable pageable