Changeset d770228

Timestamp:

02/10/22 13:43:17 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

13ecc56

Parents:

ccb2d72

Message:

deleteParkingSession method fixes

Location:

sources/app

Files:

• src/main/java/parkup/entities/ParkingSession.java (modified) (1 diff)
• src/main/java/parkup/services/ParkingSessionService.java (modified) (1 diff)
• src/main/resources/application.properties (modified) (1 diff)
• target/classes/application.properties (modified) (1 diff)
• target/classes/parkup/controllers/ParkingSessionController.class (modified) ( previous)
• target/classes/parkup/controllers/RegisteredUserController.class (added)
• target/classes/parkup/controllers/RegistriranParkiracController.class (deleted)
• target/classes/parkup/controllers/WorkerController.class (moved) (moved from sources/app/target/classes/parkup/controllers/VrabotenController.class )
• target/classes/parkup/entities/ParkingSession.class (modified) ( previous)
• target/classes/parkup/services/ParkingSessionService.class (modified) ( previous)

sources/app/src/main/java/parkup/entities/ParkingSession.java

@@ -34 +34 @@
 
     @OneToOne(cascade = {CascadeType.ALL})
-    @JoinColumn(name = "plate", nullable = false)
     private Plate plate;
 

sources/app/src/main/java/parkup/services/ParkingSessionService.java

@@ -61 +61 @@
         Optional<ParkingSession> parkingSessionOpt = Optional.ofNullable(parkingSessionRepository.findByPssId(parkingSessionId));
         if (parkingSessionOpt.isPresent()) {
+            if(parkingSessionOpt.get().getStatus()!=SessionStatus.STARTED_UNVERIFIED)
             parkingSessionOpt.get().getParkingSpace().setTaken(false);
+            parkingSessionOpt.get().setPlate(null);
             parkingSessionRepository.deleteByPssId(parkingSessionId);
             return parkingSessionOpt;

sources/app/src/main/resources/application.properties

@@ -2 +2 @@
 spring.datasource.username=postgres
 spring.datasource.password=1234
-spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.ddl-auto=create-drop
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect

sources/app/target/classes/application.properties

@@ -2 +2 @@
 spring.datasource.username=postgres
 spring.datasource.password=1234
-spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.ddl-auto=create-drop
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect