Update Reservation and ReservationTest classes.
[staff/due1/sed-hs15-srs-purple.git] / src / main / java / ch / bfh / ti / srs / dataschema / Reservation.java
index 2aa7c0d..b2bef3d 100644 (file)
@@ -7,24 +7,31 @@
  */\r
 package ch.bfh.ti.srs.dataschema;\r
 \r
+import java.util.UUID;\r
+\r
 import ch.bfh.ti.daterange.DateRange;\r
 \r
 public class Reservation {\r
 \r
-       private String name;\r
+       private UUID id;\r
+       private UUID groupId;\r
        private User user;\r
        private Resource resource;\r
        private DateRange dateRange;\r
+       private String remark;\r
+\r
+       public Reservation(User user, Resource resource, DateRange DateRange, String remark) {\r
+               if (user == null)\r
+                       throw new IllegalArgumentException("User must not be null");\r
+               if (resource == null)\r
+                       throw new IllegalArgumentException("Resource must not be null");\r
+               if (dateRange == null)\r
+                       throw new IllegalArgumentException("DateRange must not be null");\r
 \r
-       public Reservation(String name, User user, Resource resource, DateRange DateRange) {\r
-               this.name = name;\r
                this.user = user;\r
                this.resource = resource;\r
                this.dateRange = DateRange;\r
-       }\r
-\r
-       public String getName() {\r
-               return name;\r
+               this.remark = remark;\r
        }\r
 \r
        public User getUser() {\r
@@ -39,14 +46,14 @@ public class Reservation {
                return dateRange;\r
        }\r
 \r
-       public void setName(String name) {\r
-               this.name = name;\r
+       public String getRemark() {\r
+               return remark;\r
        }\r
 \r
        public void setUser(User user) {\r
                this.user = user;\r
        }\r
-\r
\r
        public void setResource(Resource resource) {\r
                this.resource = resource;\r
        }\r
@@ -54,4 +61,12 @@ public class Reservation {
        public void setDateRange(DateRange dateRange) {\r
                this.dateRange = dateRange;\r
        }\r
+\r
+       public void setRemark(String remark) {\r
+               this.remark = remark;\r
+       }\r
+       \r
+       private UUID createUUID() {\r
+               return null;\r
+       }\r
 }\r