Merge pull request #10 from brianmuse/feature/space-state

Feature: Space model updates

Author: Chris Mark

src/main/java/com/robinpowered/sdk/model/Dibs.java

@@ -29,7 +29,6 @@ public class Space implements IdentifiableApiResponseModel {
     // Immutable
     private final int id;
     private final int locationId;
-    private final boolean isDibsed;
     private final DateTime createdAt;
     private final DateTime updatedAt;
 
@@ -43,21 +42,19 @@ public class Space implements IdentifiableApiResponseModel {
     private Boolean isDisabled;
 
     // Submodels
+    private State state;
     private Location location;
     private Calendar calendar;
-    private Event currentEvent;
-    private Event nextEvent;
     private List<Amenity> amenities;
 
 
     /**
      * Methods
      */
 
-    public Space(int id, int locationId, boolean isDibsed, DateTime createdAt, DateTime updatedAt) {
+    public Space(int id, int locationId, DateTime createdAt, DateTime updatedAt) {
         this.id = id;
         this.locationId = locationId;
-        this.isDibsed = isDibsed;
         this.createdAt = createdAt;
         this.updatedAt = updatedAt;
     }
@@ -127,10 +124,6 @@ public void setType(String type) {
         this.type = type;
     }
 
-    public Boolean isDibsed() {
-        return isDibsed;
-    }
-
     public DateTime getUpdatedAt() {
         return updatedAt;
     }
@@ -139,6 +132,14 @@ public DateTime getCreatedAt() {
         return createdAt;
     }
 
+    public State getState() {
+        return state;
+    }
+
+    public void setState(State state) {
+        this.state = state;
+    }
+
     public Location getLocation() {
         return location;
     }
@@ -155,22 +156,6 @@ public void setCalendar(Calendar calendar) {
         this.calendar = calendar;
     }
 
-    public Event getCurrentEvent() {
-        return currentEvent;
-    }
-
-    public void setCurrentEvent(Event currentEvent) {
-        this.currentEvent = currentEvent;
-    }
-
-    public Event getNextEvent() {
-        return nextEvent;
-    }
-
-    public void setNextEvent(Event nextEvent) {
-        this.nextEvent = nextEvent;
-    }
-
     public List<Amenity> getAmenities() {
         return amenities;
     }
@@ -186,14 +171,13 @@ public boolean equals(Object o) {
         Space space = (Space) o;
         return Objects.equal(id, space.id) &&
                 Objects.equal(locationId, space.locationId) &&
-                Objects.equal(isDibsed, space.isDibsed) &&
                 Objects.equal(createdAt, space.createdAt) &&
                 Objects.equal(updatedAt, space.updatedAt);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(id, locationId, isDibsed, createdAt, updatedAt);
+        return Objects.hashCode(id, locationId, createdAt, updatedAt);
     }
 
     @Override
@@ -208,13 +192,10 @@ public String toString() {
                 ", capacity=" + capacity +
                 ", type=" + type +
                 ", isDisabled=" + isDisabled +
-                ", isDibsed=" + isDibsed +
                 ", updatedAt=" + updatedAt +
                 ", createdAt=" + createdAt +
                 ", location=" + location +
                 ", calendar=" + calendar +
-                ", currentEvent=" + currentEvent +
-                ", nextEvent=" + nextEvent +
                 ", amenities=" + amenities +
                 '}';
     }
@@ -223,4 +204,69 @@ public String toString() {
     public String getMimeType() {
         return MIME_TYPE;
     }
+
+    /**
+     * Represents the current state of the space, containing information about availability and whether there is
+     * presence.
+     */
+    public static class State implements ApiResponseModel {
+
+        public static final String MIME_TYPE = "vnd.robinpowered.space.state.v1";
+
+        public static final String AVAILABLE = "available";
+        public static final String BOOKED = "booked";
+        public static final String IN_USE = "in_use";
+        public static final String DISABLED = "disabled";
+
+        private final String availability;
+        private final int present;
+        private final DateTime nextBusyChange;
+
+        public State(String availability, int present, DateTime nextBusyChange) {
+            this.availability = availability;
+            this.present = present;
+            this.nextBusyChange = nextBusyChange;
+        }
+
+        public String getAvailability() {
+            return availability;
+        }
+
+        public int getPresent() {
+            return present;
+        }
+
+        public DateTime getNextBusyChange() {
+            return nextBusyChange;
+        }
+
+        @Override
+        public String getMimeType() {
+            return MIME_TYPE;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            State state = (State) o;
+            return Objects.equal(present, state.present) &&
+                    Objects.equal(availability, state.availability) &&
+                    Objects.equal(nextBusyChange, state.nextBusyChange);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hashCode(availability, present, nextBusyChange);
+        }
+
+        @Override
+        public String toString() {
+            return "State{" +
+                    "availability=" + availability +
+                    ", present=" + present +
+                    ", nextBusyChange=" + nextBusyChange +
+                    '}';
+        }
+    }
 }

src/main/java/com/robinpowered/sdk/model/Space.java

@@ -4,7 +4,6 @@
 import com.robinpowered.sdk.model.Amenity;
 import com.robinpowered.sdk.model.ApiResponse;
 import com.robinpowered.sdk.model.Calendar;
-import com.robinpowered.sdk.model.Dibs;
 import com.robinpowered.sdk.model.Location;
 import com.robinpowered.sdk.model.Organization;
 import com.robinpowered.sdk.model.Presence;
@@ -126,17 +125,4 @@ public interface PlacesService {
     // Async
     @GET("/spaces/{id}/amenities")
     void getAmenities(@Path("id") int id, @QueryMap Map<String, Object> options, Callback<ApiResponse<List<Amenity>>> callback);
-
-
-    /**
-     * Dibs
-     */
-
-    // Sync
-    @GET("/spaces/{id}/dibs")
-    ApiResponse<Dibs> getDibs(@Path("id") int id) throws IOException;
-
-    // Async
-    @GET("/spaces/{id}/dibs")
-    void getDibs(@Path("id") int id, Callback<ApiResponse<Dibs>> callback);
 }

src/main/java/com/robinpowered/sdk/service/PlacesService.java

@@ -11,4 +11,11 @@ public void testEqualsAndHashcode() {
                 .usingGetClass()
                 .verify();
     }
+
+    @Test
+    public void testEqualsAndHashcodeForState() {
+        EqualsVerifier.forClass(Space.State.class)
+                .usingGetClass()
+                .verify();
+    }
 }