Changeset 2ace8f0

Timestamp:

11/11/21 11:59:35 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

8588fcb

Parents:

97fbc67 (diff), 9504a09 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/ParkUp

Location:

sources/app

Files:

• src/main/java/parkup/configs/token/ConfirmationTokenService.java (modified) (1 diff)
• src/main/java/parkup/controllers/ParkingSpaceController.java (modified) (1 diff)
• src/main/java/parkup/controllers/ParkingZoneController.java (modified) (1 diff)
• src/main/java/parkup/entities/ParkingSpace.java (modified) (4 diffs)
• src/main/java/parkup/entities/ParkingZone.java (modified) (1 diff)
• src/main/java/parkup/services/AdministratorService.java (modified) (2 diffs)
• src/main/java/parkup/services/ParkingZoneService.java (modified) (3 diffs)
• target/classes/parkup/ParkUpApplication.class (deleted)
• target/classes/parkup/configs/PasswordEncoder.class (deleted)
• target/classes/parkup/configs/email/EmailSender.class (deleted)
• target/classes/parkup/configs/email/EmailService.class (deleted)
• target/classes/parkup/configs/email/EmailValidator.class (deleted)
• target/classes/parkup/controllers/GuestController.class (deleted)
• target/classes/parkup/entities/Administrator.class (deleted)
• target/classes/parkup/entities/Guest.class (deleted)
• target/classes/parkup/repositories/AdministratorRepository.class (deleted)
• target/classes/parkup/repositories/ParkingSessionRepository.class (deleted)
• target/classes/parkup/repositories/ParkingSpaceRepository.class (deleted)
• target/classes/parkup/services/GuestService.class (deleted)

sources/app/src/main/java/parkup/configs/token/ConfirmationTokenService.java

@@ -12 +12 @@
     private final ConfirmationTokenRepositoryW confirmationTokenRepositoryW;
 
+<<<<<<< HEAD
     public ConfirmationTokenService(ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP, ConfirmationTokenRepositoryW confirmationTokenRepositoryW, parkup.configs.token.ConfirmationTokenRepositoryW confirmationTokenRepositoryW1) {
         this.confirmationTokenRepositoryRP = confirmationTokenRepositoryRP;
         this.confirmationTokenRepositoryW = confirmationTokenRepositoryW1;
+=======
+    public ConfirmationTokenService(ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP, ConfirmationTokenRepositoryW confirmationTokenRepositoryW) {
+        this.confirmationTokenRepositoryRP = confirmationTokenRepositoryRP;
+        this.confirmationTokenRepositoryW = confirmationTokenRepositoryW;
+>>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939
     }
 

sources/app/src/main/java/parkup/controllers/ParkingSpaceController.java

@@ -35 +35 @@
     @PostMapping({"/parkingSpace"})
     public Optional<ParkingSpace> addParkingSpace(@RequestBody ParkingSpace parkingSpace) {
+<<<<<<< HEAD
         System.out.println("???????");
+=======
+        //System.out.println("???????");
+>>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939
         return this.parkingSpaceService.addParkingSpace(parkingSpace);
     }

sources/app/src/main/java/parkup/controllers/ParkingZoneController.java

@@ -52 +52 @@
         return this.parkingZoneService.updateParkingZone(parkingZoneId, parkingZone.getPzName(), parkingZone.getPrice(), parkingZone.getCapacity(),
                 parkingZone.getLocation(), parkingZone.getFrom(), parkingZone.getTo(), parkingZone.getColor(),
+<<<<<<< HEAD
                 parkingZone.getParkingSpaces(), parkingZone.getParkingZoneLocation(),parkingZone.getOdgovorniLica());
+=======
+                parkingZone.getParkingSpaces(), parkingZone.getParkingZoneLocation());
+>>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939
     }
 

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

@@ -31 +31 @@
     @Column(name = "latitude")
     private float lat;
+<<<<<<< HEAD
 
     @Column(name = "longitude")
@@ -43 +44 @@
     }
 
+=======
+
+    @Column(name = "longitude")
+    private float lng;
+
+    @OneToOne(cascade = {CascadeType.ALL})
+    @JoinColumn(name = "parking_zona")
+    private ParkingZone parkingZone;
+
+    public ParkingSpace() {}
+
+>>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939
     public ParkingSpace(int psId, String psName, boolean isTaken, boolean isHandicaped, float lat, float lng) {
         this.psId = psId;
@@ -107 +120 @@
         this.lng = lng;
     }
+<<<<<<< HEAD
 
     @Override
@@ -118 +132 @@
                 '}';
     }
+=======
+>>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939
 }
 

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

@@ -33 +33 @@
     private int capacity;
 
+<<<<<<< HEAD
     @Column(name = "time_from")  //za rabotni casovi od:
     private int from;
 
     @Column(name = "time_to")    //za rabotni casovi do:
+=======
+    @Column(name = "vreme_od")  //za rabotni casovi od:
+    private int from;
+
+    @Column(name = "vreme_do")    //za rabotni casovi do:
+>>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939
     private int to;
 

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

@@ -137 +137 @@
 
         String token = UUID.randomUUID().toString();
+<<<<<<< HEAD
 //        ConfirmationTokenRP confirmationToken = new ConfirmationTokenRP(
 //                token,
@@ -143 +144 @@
 //                administrator
 //        );
+=======
+        //ConfirmationTokenRP confirmationToken = new ConfirmationTokenRP(
+        //        token,
+        //        LocalDateTime.now(),
+        //        LocalDateTime.now().plusMinutes(15),
+        //        administrator
+        //);
+>>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939
 
         //confirmationTokenService.saveConfirmationToken(confirmationToken);

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

@@ -65 +65 @@
     }
 
+<<<<<<< HEAD
     //TODO proveri dali ima odgovorni i dokolku ima dali postojat vo bazata
     @Transactional
@@ -77 +78 @@
             System.out.println(v.toString());
         }
+=======
+    //TODO prati niza od objekti ParkingSpaces i prati objekt ParkingZoneLocation
+    @Transactional
+    public ParkingZone updateParkingZone(int parkingZoneId, String pzName, int price, int capacity,
+                                         String location, int from, int to, String color,
+                                         List<ParkingSpace> parkingSpaces, ParkingZoneLocation parkingZoneLocation) {
+>>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939
         Optional<ParkingZone> parkingZoneOpt = Optional.ofNullable(parkingZoneRepository.findByPzId(parkingZoneId));
         if (parkingZoneOpt.isPresent()) {
@@ -121 +129 @@
                 parkingZoneNov.setParkingSpaces(parkingSpaces);
             }
+<<<<<<< HEAD
             if(!odgovorniLica.isEmpty()){
 
                 parkingZoneNov.setOdgovorniLica(odgovorniLica);
             }
+=======
+>>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939
 
             return parkingZoneNov;