Fix endpoints, null checks

src/main/java/sig/family/Endpoints.java

@@ -71,8 +71,13 @@ public class Endpoints {
 	}
 	
 	@GetMapping("/family/{id}")
-	public Optional<Family> _2(@PathVariable Long id) {
+	public FamilyContainer _2(@PathVariable Long id) {
-		return families.findById(id);
+		if (families.existsById(id)) {
+			Family f = families.findById(id).get();
+			return new FamilyContainer(f.getName(),families,relationships,members);
+		} else {
+			return null;
+		}
 	}
 	
 	@PostMapping("/family")
@@ -173,6 +178,7 @@ public class Endpoints {
 			FamilyMember m = members.findById(fr.getMemberId()).get();
 			boolean isParent = relationships.findByMemberIdAndRelationshipIn(Long.parseLong(body.get("member")),Arrays.asList("Father","Mother","Parent")).size()>0;
 			if (loc.size()>0) {
+				if (m.getLastLocationId()==null||m.getLastLocationId()!=loc.get(0).getId()) {
 					KnownLocation ll = loc.get(0);
 					if (!ll.isSafe()) {
 						notifications.save(new Notification("You are arriving at "+ll.getName()+", which is considered an unsafe location! Be careful!",m.getId(),1,new Date()));
@@ -188,6 +194,9 @@ public class Endpoints {
 							}
 						}
 					}
+					m.setLastLocationId(loc.get(0).getId());
+					members.save(m);
+				}
 			}
 			
 			//notifications.save(new Notification());

src/main/java/sig/family/FamilyContainer.java

@@ -21,17 +21,18 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 public class FamilyContainer extends Family{
 	
 	List<FamilyMember> members = new ArrayList<>();
+	Long id = -1l;
 	
 	FamilyContainer(String name
 			,FamilyRepository families
 			,FamilyRelationshipRepository relationships
 			,FamilyMemberRepository members) {
 		super(name);
-		List<FamilyRelationship> relations = relationships.findByFamilyId(families.findByName(name).get(0).getId());
+		id = families.findByName(name).get(0).getId();
+		List<FamilyRelationship> relations = relationships.findByFamilyId(id);
 		for (FamilyRelationship r : relations) {
 			this.members.add(members.findById(r.getMemberId()).get());
 		}
-		System.out.println("Called: "+this.members);
 	}
 
 	public List<FamilyMember> getMembers() {
@@ -41,4 +42,12 @@ public class FamilyContainer extends Family{
 	public void setMembers(List<FamilyMember> members) {
 		this.members = members;
 	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
 }

src/main/java/sig/family/FamilyMember.java

@@ -23,6 +23,8 @@ public class FamilyMember {
 	
 	Long mobileDeviceId;
 	
+	Long lastLocationId;
+	
 	FamilyMember(){}
 	
 	public FamilyMember(String firstName, String lastName, Long mobileDeviceId) {
@@ -55,4 +57,12 @@ public class FamilyMember {
 	public void setMobileDeviceId(Long mobileDeviceId) {
 		this.mobileDeviceId = mobileDeviceId;
 	}
+
+	public Long getLastLocationId() {
+		return lastLocationId;
+	}
+
+	public void setLastLocationId(Long lastLocationId) {
+		this.lastLocationId = lastLocationId;
+	}
 }