Adresses Simone's comments about the user builder and its tests

MediaTo-SDP · Mar 9, 2023 · 2d89969 · 2d89969
1 parent 22e38d9
commit 2d89969
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 11 deletions.
diff --git a/app/src/main/java/com/github/sdp/mediato/errorCheck/Preconditions.java b/app/src/main/java/com/github/sdp/mediato/errorCheck/Preconditions.java
@@ -4,6 +4,7 @@
 import static com.github.sdp.mediato.model.Review.MIN_GRADE;
 import static com.github.sdp.mediato.model.User.LIMIT_LOCATION_SIZE;
 
+import com.github.sdp.mediato.model.Location;
 import com.github.sdp.mediato.model.User;
 import com.github.sdp.mediato.model.media.Media;
 import com.github.sdp.mediato.model.media.MediaType;
@@ -17,6 +18,11 @@
  */
 public class Preconditions {
 
+    public static final double MAX_LATITUDE = 90;
+    public static final double MAX_LONGITUDE = 180;
+    public static final double MIN_LATITUDE = -90;
+    public static final double MIN_LONGITUDE = -180;
+
     /**
      * Checks if mandatory user fields are valid
      * @param user
@@ -135,9 +141,18 @@ public static void checkRegisterDate(String registerDate){
      * Checks if the location is valid
      * @param location
      */
-    public static void checkLocation(List<Double> location) {
-        if (location == null || location.isEmpty()) throw new IllegalArgumentException("Location is unknown: list is null or empty");
-        if (location.size() != LIMIT_LOCATION_SIZE) throw new IllegalArgumentException("Location should contain exactly two doubles");
+    public static void checkLocation(Location location) {
+        if (location.isValid() && !locationWithinBounds(location)){
+            throw new IllegalArgumentException("Location mus be between -90 and 90 for latitude and -180 and 180 for longitude");
+        }
+    }
+
+    /**
+     * Checks if the latitude and longitude are within the authorised bounds
+     */
+    public static boolean locationWithinBounds(Location location){
+        return (location.getLatitude() > MIN_LATITUDE && location.getLatitude() < MAX_LATITUDE)
+                && (location.getLongitude() > MIN_LONGITUDE && location.getLongitude() < MAX_LONGITUDE);
     }
 
     /**

diff --git a/app/src/main/java/com/github/sdp/mediato/model/User.java b/app/src/main/java/com/github/sdp/mediato/model/User.java
@@ -19,11 +19,11 @@ public class User {
     private String birthDate = "";
     private String registerDate = "";
 
-    private List<Double> location = new ArrayList<>();
+    private Location location = new Location();
     private List<User> friends = new ArrayList<>();
     private Map<String, List<Review>> reviews = new HashMap<>();
     private User(){}
-    public User(UserBuilder builder){
+    private User(UserBuilder builder){
         this.id = builder.id;
         this.username = builder.username;
         this.displayedName = builder.displayedName;
@@ -57,7 +57,7 @@ public String getRegisterDate() {
         return registerDate;
     }
 
-    public List<Double> getLocation() {
+    public Location getLocation() {
         return location;
     }
 
@@ -73,7 +73,7 @@ public static class UserBuilder {
         private String birthDate = "";
         private String registerDate = "";
 
-        private List<Double> location = new ArrayList<>();
+        private Location location = new Location();
         private List<User> friends = new ArrayList<>();
         private Map<String, List<Review>> reviews = new HashMap<>();
 
@@ -109,7 +109,7 @@ public UserBuilder setRegisterDate(String registerDate) {
             this.registerDate = registerDate;
             return this;
         }
-        public UserBuilder setLocation(List<Double> location) {
+        public UserBuilder setLocation(Location location) {
             Preconditions.checkLocation(location);
             this.location = location;
             return this;

diff --git a/app/src/test/java/com/github/sdp/mediato/modelTests.java b/app/src/test/java/com/github/sdp/mediato/modelTests.java
@@ -6,6 +6,7 @@
 
 import static org.junit.Assert.*;
 
+import com.github.sdp.mediato.model.Location;
 import com.github.sdp.mediato.model.User;
 
 import java.util.ArrayList;
@@ -15,6 +16,7 @@
 public class modelTests {
 
     @Test
+    //Tests that the user builder registers mandatory attributes correctly
     public void user_builder_registers_mandatory_attributes(){
         //Build new user
         User  user = new User.UserBuilder("uniqueId")
@@ -23,7 +25,7 @@ public void user_builder_registers_mandatory_attributes(){
                 .setEmail("email")
                 .setRegisterDate("09/03/2023")
                 .setBirthDate("09/03/2023")
-                .setLocation(Arrays.asList(3.14, 3.14))
+                .setLocation(new Location(3.14, 3.14))
                 .build();
 
         //Check values
@@ -33,11 +35,12 @@ public void user_builder_registers_mandatory_attributes(){
         Assert.assertEquals("email", user.getEmail());
         Assert.assertEquals("09/03/2023", user.getRegisterDate());
         Assert.assertEquals("09/03/2023", user.getBirthDate());
-        assertTrue(user.getLocation().containsAll(Arrays.asList(3.14, 3.14)));
+        assertTrue(user.getLocation().getLatitude() == 3.14 && user.getLocation().getLongitude() ==3.14);
     }
 
     @Test
-    public void user_builder_fails_with_invalid_strings(){
+    //Checks that the user builder fails when it's missing mandatory attributes
+    public void user_builder_fails_with_missing_mandatory_attributes(){
         assertThrows(IllegalArgumentException.class,
                 () -> {
                     //Build new user with missing attributes