Changeset 2ace8f0 for sources/app/src/main/java/parkup
- Timestamp:
- 11/11/21 11:59:35 (3 years ago)
- 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. - Location:
- sources/app/src/main/java/parkup
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/configs/token/ConfirmationTokenService.java
r97fbc67 r2ace8f0 12 12 private final ConfirmationTokenRepositoryW confirmationTokenRepositoryW; 13 13 14 <<<<<<< HEAD 14 15 public ConfirmationTokenService(ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP, ConfirmationTokenRepositoryW confirmationTokenRepositoryW, parkup.configs.token.ConfirmationTokenRepositoryW confirmationTokenRepositoryW1) { 15 16 this.confirmationTokenRepositoryRP = confirmationTokenRepositoryRP; 16 17 this.confirmationTokenRepositoryW = confirmationTokenRepositoryW1; 18 ======= 19 public ConfirmationTokenService(ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP, ConfirmationTokenRepositoryW confirmationTokenRepositoryW) { 20 this.confirmationTokenRepositoryRP = confirmationTokenRepositoryRP; 21 this.confirmationTokenRepositoryW = confirmationTokenRepositoryW; 22 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939 17 23 } 18 24 -
sources/app/src/main/java/parkup/controllers/ParkingSpaceController.java
r97fbc67 r2ace8f0 35 35 @PostMapping({"/parkingSpace"}) 36 36 public Optional<ParkingSpace> addParkingSpace(@RequestBody ParkingSpace parkingSpace) { 37 <<<<<<< HEAD 37 38 System.out.println("???????"); 39 ======= 40 //System.out.println("???????"); 41 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939 38 42 return this.parkingSpaceService.addParkingSpace(parkingSpace); 39 43 } -
sources/app/src/main/java/parkup/controllers/ParkingZoneController.java
r97fbc67 r2ace8f0 52 52 return this.parkingZoneService.updateParkingZone(parkingZoneId, parkingZone.getPzName(), parkingZone.getPrice(), parkingZone.getCapacity(), 53 53 parkingZone.getLocation(), parkingZone.getFrom(), parkingZone.getTo(), parkingZone.getColor(), 54 <<<<<<< HEAD 54 55 parkingZone.getParkingSpaces(), parkingZone.getParkingZoneLocation(),parkingZone.getOdgovorniLica()); 56 ======= 57 parkingZone.getParkingSpaces(), parkingZone.getParkingZoneLocation()); 58 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939 55 59 } 56 60 -
sources/app/src/main/java/parkup/entities/ParkingSpace.java
r97fbc67 r2ace8f0 31 31 @Column(name = "latitude") 32 32 private float lat; 33 <<<<<<< HEAD 33 34 34 35 @Column(name = "longitude") … … 43 44 } 44 45 46 ======= 47 48 @Column(name = "longitude") 49 private float lng; 50 51 @OneToOne(cascade = {CascadeType.ALL}) 52 @JoinColumn(name = "parking_zona") 53 private ParkingZone parkingZone; 54 55 public ParkingSpace() {} 56 57 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939 45 58 public ParkingSpace(int psId, String psName, boolean isTaken, boolean isHandicaped, float lat, float lng) { 46 59 this.psId = psId; … … 107 120 this.lng = lng; 108 121 } 122 <<<<<<< HEAD 109 123 110 124 @Override … … 118 132 '}'; 119 133 } 134 ======= 135 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939 120 136 } 121 137 -
sources/app/src/main/java/parkup/entities/ParkingZone.java
r97fbc67 r2ace8f0 33 33 private int capacity; 34 34 35 <<<<<<< HEAD 35 36 @Column(name = "time_from") //za rabotni casovi od: 36 37 private int from; 37 38 38 39 @Column(name = "time_to") //za rabotni casovi do: 40 ======= 41 @Column(name = "vreme_od") //za rabotni casovi od: 42 private int from; 43 44 @Column(name = "vreme_do") //za rabotni casovi do: 45 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939 39 46 private int to; 40 47 -
sources/app/src/main/java/parkup/services/AdministratorService.java
r97fbc67 r2ace8f0 137 137 138 138 String token = UUID.randomUUID().toString(); 139 <<<<<<< HEAD 139 140 // ConfirmationTokenRP confirmationToken = new ConfirmationTokenRP( 140 141 // token, … … 143 144 // administrator 144 145 // ); 146 ======= 147 //ConfirmationTokenRP confirmationToken = new ConfirmationTokenRP( 148 // token, 149 // LocalDateTime.now(), 150 // LocalDateTime.now().plusMinutes(15), 151 // administrator 152 //); 153 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939 145 154 146 155 //confirmationTokenService.saveConfirmationToken(confirmationToken); -
sources/app/src/main/java/parkup/services/ParkingZoneService.java
r97fbc67 r2ace8f0 65 65 } 66 66 67 <<<<<<< HEAD 67 68 //TODO proveri dali ima odgovorni i dokolku ima dali postojat vo bazata 68 69 @Transactional … … 77 78 System.out.println(v.toString()); 78 79 } 80 ======= 81 //TODO prati niza od objekti ParkingSpaces i prati objekt ParkingZoneLocation 82 @Transactional 83 public ParkingZone updateParkingZone(int parkingZoneId, String pzName, int price, int capacity, 84 String location, int from, int to, String color, 85 List<ParkingSpace> parkingSpaces, ParkingZoneLocation parkingZoneLocation) { 86 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939 79 87 Optional<ParkingZone> parkingZoneOpt = Optional.ofNullable(parkingZoneRepository.findByPzId(parkingZoneId)); 80 88 if (parkingZoneOpt.isPresent()) { … … 121 129 parkingZoneNov.setParkingSpaces(parkingSpaces); 122 130 } 131 <<<<<<< HEAD 123 132 if(!odgovorniLica.isEmpty()){ 124 133 125 134 parkingZoneNov.setOdgovorniLica(odgovorniLica); 126 135 } 136 ======= 137 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939 127 138 128 139 return parkingZoneNov;
Note:
See TracChangeset
for help on using the changeset viewer.