Changeset 2ace8f0 for sources/app/src/main/java/parkup/services

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/src/main/java/parkup/services

Files:

• AdministratorService.java (modified) (2 diffs)
• ParkingZoneService.java (modified) (3 diffs)

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;