Merge pull request #16 from lukaszstefanowski97/65-76-dodanie

ADD attribute address to FireReport entity
lukaszstefanowski97 · Oct 19, 2019 · b4f0d63 · b4f0d63
2 parents c80d53c + 36aa086
commit b4f0d63
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 11 deletions.
diff --git a/src/main/java/com/example/nasa/controllers/FireReportController.java b/src/main/java/com/example/nasa/controllers/FireReportController.java
@@ -53,7 +53,8 @@ public ResponseEntity<FireReportDTO> addFireReport(@RequestBody FireReportDTO fi
                 fireReportDTO.getDescription(), fireReportDTO.getFireDepartamentDescription(),
                 fireReportDTO.getArePeople(), fireReportDTO.getIsWood(),
                 fireReportDTO.getIsBuilding(), fireReportDTO.getIsElectricity(),
-                fireReportDTO.getIsHazardousMaterial(), fireReportDTO.getPhoto());
+                fireReportDTO.getIsHazardousMaterial(), fireReportDTO.getPhoto(),
+                fireReportDTO.getAddress());
 
         fireReport.setReporterId(userDTO.getId());
         fireReportService.saveFireReport(fireReport);
@@ -74,7 +75,8 @@ public ResponseEntity<FireReportDTO> addFireReportUnregistered(@RequestBody Fire
                 fireReportDTO.getDescription(), fireReportDTO.getFireDepartamentDescription(),
                 fireReportDTO.getArePeople(), fireReportDTO.getIsWood(),
                 fireReportDTO.getIsBuilding(), fireReportDTO.getIsElectricity(),
-                fireReportDTO.getIsHazardousMaterial(), fireReportDTO.getPhoto());
+                fireReportDTO.getIsHazardousMaterial(), fireReportDTO.getPhoto(),
+                fireReportDTO.getAddress());
 
         UnregisteredUser unregisteredUser = new UnregisteredUser(unregisteredUserDTO.getName(),
                 unregisteredUserDTO.getSurname(), unregisteredUserDTO.getCellPhoneNumber());

diff --git a/src/main/java/com/example/nasa/controllers/UserController.java b/src/main/java/com/example/nasa/controllers/UserController.java
@@ -44,7 +44,7 @@ public ResponseEntity<UserDTO> getUserById(@PathVariable Long id) {
     public ResponseEntity<UserDTO> addUser(@RequestBody User user) {
         userService.saveUser(user);
         UserDTO userDTO = new UserDTO(user.getId(), user.getName(), user.getSurname(), user.getCellPhoneNumber(),
-                user.getEmail(), user.getPhoto());
+                user.getEmail(), user.getPhoto(), user.getNotificationRangeInMeters());
 
         log.info(UserMessages.ADDED_USER + userDTO.toString());
 

diff --git a/src/main/java/com/example/nasa/dto/FireReportDTO.java b/src/main/java/com/example/nasa/dto/FireReportDTO.java
@@ -42,4 +42,6 @@ public class FireReportDTO {
     private Boolean isHazardousMaterial;
 
     private byte[] photo;
+
+    private String address;
 }
diff --git a/src/main/java/com/example/nasa/dto/UserDTO.java b/src/main/java/com/example/nasa/dto/UserDTO.java
@@ -20,4 +20,6 @@ public class UserDTO {
     private String email;
 
     private String photo;
+
+    private Long notificationRangeInMeters;
 }
diff --git a/src/main/java/com/example/nasa/entities/FireReport.java b/src/main/java/com/example/nasa/entities/FireReport.java
@@ -51,10 +51,12 @@ public class FireReport {
 
     private byte[] photo;
 
+    private String address;
+
     public FireReport(Long reporterId, Double x, Double y, Date startDate, Integer fireReportApproveCounter,
                       Boolean fireTeam, Boolean isActiveFire, String description, String fireDepartamentDescription,
                       Boolean arePeople, Boolean isWood, Boolean isBuilding, Boolean isElectricity,
-                      Boolean isHazardousMaterial, byte[] photo) {
+                      Boolean isHazardousMaterial, byte[] photo, String address) {
         this.reporterId = reporterId;
         this.x = x;
         this.y = y;
@@ -70,5 +72,6 @@ public FireReport(Long reporterId, Double x, Double y, Date startDate, Integer f
         this.isElectricity = isElectricity;
         this.isHazardousMaterial = isHazardousMaterial;
         this.photo = photo;
+        this.address = address;
     }
 }
diff --git a/src/main/java/com/example/nasa/entities/User.java b/src/main/java/com/example/nasa/entities/User.java
@@ -28,13 +28,16 @@ public class User {
 
     private String photo;
 
-    public User(String name, String surname, String password, String cellPhoneNumber, String email, String photo) {
+    private Long notificationRangeInMeters;
+
+    public User(String name, String surname, String password, String cellPhoneNumber, String email, String photo, Long notificationRangeInMeters) {
 
         this.name = name;
         this.surname = surname;
         this.password = password;
         this.cellPhoneNumber = cellPhoneNumber;
         this.email = email;
         this.photo = photo;
+        this.notificationRangeInMeters = notificationRangeInMeters;
     }
 }
diff --git a/src/main/java/com/example/nasa/services/impl/FireReportServiceImpl.java b/src/main/java/com/example/nasa/services/impl/FireReportServiceImpl.java
@@ -53,7 +53,8 @@ public FireReportDTO editFireReportById(Long id, FireReportDTO fireReportDTO) {
                     fireReportDTO.getDescription(), fireReportDTO.getFireDepartamentDescription(),
                     fireReportDTO.getArePeople(), fireReportDTO.getIsWood(),
                     fireReportDTO.getIsBuilding(), fireReportDTO.getIsElectricity(),
-                    fireReportDTO.getIsHazardousMaterial(), fireReportDTO.getPhoto()));
+                    fireReportDTO.getIsHazardousMaterial(), fireReportDTO.getPhoto(),
+                    fireReportDTO.getAddress()));
 
             return fireReportDTO;
         }

diff --git a/src/main/java/com/example/nasa/services/impl/UserServiceImpl.java b/src/main/java/com/example/nasa/services/impl/UserServiceImpl.java
@@ -23,7 +23,7 @@ public List<UserDTO> getAllUsers() {
         List<UserDTO> userDTOs = new ArrayList<>();
         for (User user : users) {
             userDTOs.add(new UserDTO(user.getId(), user.getName(), user.getSurname(), user.getCellPhoneNumber(),
-                    user.getEmail(), user.getPhoto()));
+                    user.getEmail(), user.getPhoto(), user.getNotificationRangeInMeters()));
         }
 
         return userDTOs;
@@ -35,7 +35,7 @@ public UserDTO getUserById(Long id) {
 
         return user.map(value -> new UserDTO(value.getId(), value.getName(), value.getSurname(),
                 value.getCellPhoneNumber(), value.getEmail(),
-                value.getPhoto())).orElse(null);
+                value.getPhoto(), value.getNotificationRangeInMeters())).orElse(null);
 
     }
 
@@ -47,7 +47,7 @@ public UserDTO deleteUserById(Long id) {
             userRepository.deleteById(id);
             return new UserDTO(user.get().getId(), user.get().getName(), user.get().getSurname(),
                     user.get().getCellPhoneNumber(), user.get().getEmail(),
-                    user.get().getPhoto());
+                    user.get().getPhoto(), user.get().getNotificationRangeInMeters());
         }
 
         return null;
@@ -61,7 +61,7 @@ public UserDTO editUserById(Long id, User userCommand) {
             userRepository.deleteById(id);
             return new UserDTO(userRepository.save(userCommand).getId(), userCommand.getName(), userCommand.getSurname(),
                     userCommand.getCellPhoneNumber(), userCommand.getEmail(),
-                    userCommand.getPhoto());
+                    userCommand.getPhoto(), userCommand.getNotificationRangeInMeters());
         }
         return null;
     }
@@ -70,6 +70,7 @@ public UserDTO editUserById(Long id, User userCommand) {
     public UserDTO saveUser(User user) {
         userRepository.save(user);
         return new UserDTO(user.getId(), user.getName(), user.getSurname(),
-                user.getCellPhoneNumber(), user.getEmail(), user.getPhoto());
+                user.getCellPhoneNumber(), user.getEmail(), user.getPhoto(),
+                user.getNotificationRangeInMeters());
     }
 }