Ja vr private descriptions

api/src/main/java/com/codeforcommunity/dto/userEvents/components/EventDetails.java

@@ -10,12 +10,19 @@
 /** A class to represent the details of an event. */
 public class EventDetails extends ApiDto {
   private String description;
+  private String privateDescription;
   private String location;
   private Timestamp start;
   private Timestamp end;
 
-  public EventDetails(String description, String location, Timestamp start, Timestamp end) {
+  public EventDetails(
+      String description,
+      String privateDescription,
+      String location,
+      Timestamp start,
+      Timestamp end) {
     this.description = description;
+    this.privateDescription = privateDescription;
     this.location = location;
     this.start = start;
     this.end = end;
@@ -41,6 +48,24 @@ public void setDescription(String description) {
     this.description = description;
   }
 
+  /**
+   * Gets the event's private description.
+   *
+   * @return the event's private description
+   */
+  public String getPrivateDescription() {
+    return privateDescription;
+  }
+
+  /**
+   * Sets the given private description as the description of the event
+   *
+   * @param privateDescription the private description to be set
+   */
+  public void setPrivateDescription(String privateDescription) {
+    this.privateDescription = privateDescription;
+  }
+
   /**
    * Gets the location of the event.
    *

api/src/main/java/com/codeforcommunity/dto/userEvents/requests/GetUserEventsRequest.java

@@ -16,6 +16,12 @@ public GetUserEventsRequest(
     this.count = count;
   }
 
+  public GetUserEventsRequest() {
+    this.endDate = Optional.empty();
+    this.startDate = Optional.empty();
+    this.count = Optional.empty();
+  }
+
   /**
    * Gets the end date of the event.
    *

persist/src/main/resources/db/migration/V18__AddEventPrivateDescription.sql

@@ -0,0 +1,2 @@
+ALTER TABLE events
+    ADD COLUMN private_description TEXT DEFAULT NULL;

service/src/main/java/com/codeforcommunity/ServiceMain.java

@@ -59,6 +59,7 @@ private void updateSystemProperties() {
 
   /** Connect to the database and create a DSLContext so jOOQ can interact with it. */
   private void createDatabaseConnection() throws ClassNotFoundException {
+
     // Load configuration from db.properties file
     String databaseDriver = PropertiesLoader.loadProperty("database_driver");
     String databaseUrl = PropertiesLoader.loadProperty("database_url");

service/src/main/java/com/codeforcommunity/processor/EventsProcessorImpl.java

@@ -81,6 +81,35 @@ public SingleEventResponse getSingleEvent(int eventId, JWTData userData) {
       throw new EventDoesNotExistException(eventId);
     }
 
+    // getting all of the users registered for this event
+    // TODO: is it bad that we're pretending to be an admin in this method call?
+    EventRegistrations registrations = this.getEventRegisteredUsers(eventId, new JWTData(0, PrivilegeLevel.ADMIN));
+    boolean userRegisteredForEvent = false;
+    for (Registration reg : registrations.getRegistrations()) {
+      if (reg.getUserId() == userData.getUserId()) {
+        userRegisteredForEvent = true;
+        break;
+      }
+    }
+
+    // hide the private description if the user isn't registered and they're not an admin
+    if (!userRegisteredForEvent && userData.getPrivilegeLevel() != PrivilegeLevel.ADMIN) {
+      event.setPrivateDescription(null);
+    }
+
+    //    GetEventsResponse res = this.getEventsSignedUp(new GetUserEventsRequest(), userData);
+    //    boolean userRegisteredForEvent = false;
+    //    for (SingleEventResponse registeredEvent : res.getEvents()) {
+    //      if (registeredEvent.getId() == eventId) {
+    //        userRegisteredForEvent = true;
+    //        break;
+    //      }
+    //    }
+    //
+    //    if (!userRegisteredForEvent) {
+    //      event.setPrivateDescription(null);
+    //    }
+
     return eventPojoToResponse(event, userData);
   }
 
@@ -188,6 +217,9 @@ public SingleEventResponse modifyEvent(
       if (details.getDescription() != null) {
         record.setDescription(details.getDescription());
       }
+      if (details.getPrivateDescription() != null) {
+        record.setPrivateDescription(details.getPrivateDescription());
+      }
       if (details.getLocation() != null) {
         record.setLocation(details.getLocation());
       }
@@ -347,6 +379,7 @@ private List<SingleEventResponse> listOfEventsToListOfSingleEventResponse(
               EventDetails details =
                   new EventDetails(
                       event.getDescription(),
+                      event.getPrivateDescription(),
                       event.getLocation(),
                       event.getStartTime(),
                       event.getEndTime());
@@ -371,7 +404,11 @@ private SingleEventResponse eventPojoToResponse(Events event, JWTData userData)
 
     EventDetails details =
         new EventDetails(
-            event.getDescription(), event.getLocation(), event.getStartTime(), event.getEndTime());
+            event.getDescription(),
+            event.getPrivateDescription(),
+            event.getLocation(),
+            event.getStartTime(),
+            event.getEndTime());
     return new SingleEventResponse(
         event.getId(),
         event.getTitle(),
@@ -389,6 +426,7 @@ private EventsRecord eventRequestToRecord(CreateEventRequest request) {
     EventsRecord newRecord = db.newRecord(EVENTS);
     newRecord.setTitle(request.getTitle());
     newRecord.setDescription(request.getDetails().getDescription());
+    newRecord.setPrivateDescription(request.getDetails().getPrivateDescription());
     newRecord.setThumbnail(request.getThumbnail());
     newRecord.setCapacity(request.getCapacity());
     newRecord.setLocation(request.getDetails().getLocation());

service/src/main/java/com/codeforcommunity/processor/PublicEventsProcessorImpl.java

@@ -61,6 +61,7 @@ private List<PublicSingleEventResponse> listOfEventsToListOfPublicSingleEventRes
               EventDetails details =
                   new EventDetails(
                       event.getDescription(),
+                      null,
                       event.getLocation(),
                       event.getStartTime(),
                       event.getEndTime());

service/src/test/java/com/codeforcommunity/processor/EventsProcessorImplTest.java

@@ -92,6 +92,7 @@ public void testCreateEvent1() {
     EventDetails myEventDetails =
         new EventDetails(
             "my event",
+            "please arrive 5 min early",
             "boston",
             new Timestamp(START_TIMESTAMP_TEST),
             new Timestamp(END_TIMESTAMP_TEST));
@@ -117,6 +118,7 @@ public void testCreateEvent2() {
     EventDetails myEventDetails =
         new EventDetails(
             "my event",
+            null,
             "boston",
             new Timestamp(START_TIMESTAMP_TEST),
             new Timestamp(END_TIMESTAMP_TEST));
@@ -174,6 +176,7 @@ public void testGetSingleEvent2() {
     EventDetails myEventDetails =
         new EventDetails(
             "my event",
+            null,
             "boston",
             new Timestamp(START_TIMESTAMP_TEST),
             new Timestamp(END_TIMESTAMP_TEST));
@@ -188,6 +191,7 @@ public void testGetSingleEvent2() {
     eventRecord.setCapacity(myEventRequest.getCapacity());
     eventRecord.setLocation(myEventDetails.getLocation());
     eventRecord.setDescription(myEventDetails.getDescription());
+    eventRecord.setPrivateDescription(myEventDetails.getPrivateDescription());
     eventRecord.setStartTime(myEventDetails.getStart());
     eventRecord.setEndTime(myEventDetails.getEnd());
     eventRecord.setPrice(myEventRequest.getPrice());
@@ -703,6 +707,7 @@ public void testModifyEvent2() {
             null,
             new EventDetails(
                 "new description",
+                "remember to bring a jacket ;)",
                 "new location",
                 new Timestamp(START_TIMESTAMP_TEST),
                 new Timestamp(END_TIMESTAMP_TEST)),
@@ -714,6 +719,7 @@ public void testModifyEvent2() {
     myEvent.setTitle("old title");
     myEvent.setCapacity(5);
     myEvent.setDescription("old description");
+    myEvent.setPrivateDescription("old private description");
     myEvent.setLocation("old location");
     myEvent.setPrice(500);
     myEvent.setStartTime(new Timestamp(0));
@@ -768,6 +774,7 @@ public void testModifyEvent3() {
     myEvent.setTitle("old title");
     myEvent.setCapacity(5);
     myEvent.setDescription("old description");
+    myEvent.setPrivateDescription("old private description");
     myEvent.setLocation("old location");
     myEvent.setStartTime(new Timestamp(0));
     myEvent.setEndTime(new Timestamp(0));
@@ -818,6 +825,7 @@ public void testModifyEvent4() {
     myEvent.setTitle("old title");
     myEvent.setCapacity(5);
     myEvent.setDescription("old description");
+    myEvent.setPrivateDescription("old private description");
     myEvent.setLocation("old location");
     myEvent.setPrice(20);
     myEvent.setStartTime(new Timestamp(0));
@@ -855,6 +863,7 @@ public void testModifyEvent5() {
     myEvent.setTitle("old title");
     myEvent.setCapacity(5);
     myEvent.setDescription("old description");
+    myEvent.setPrivateDescription("old private description");
     myEvent.setLocation("old location");
     myEvent.setPrice(65);
     myEvent.setStartTime(new Timestamp(0));
@@ -886,14 +895,15 @@ public void testModifyEvent6() {
             "edited title",
             null,
             null,
-            new EventDetails("new description", "new location", null, null),
+            new EventDetails("new description", null, "new location", null, null),
             50);
 
     EventsRecord myEvent = myJooqMock.getContext().newRecord(EVENTS);
     myEvent.setId(0);
     myEvent.setTitle("old title");
     myEvent.setCapacity(5);
     myEvent.setDescription("old description");
+    myEvent.setPrivateDescription("old private description");
     myEvent.setLocation("old location");
     myEvent.setPrice(50);
     myEvent.setStartTime(new Timestamp(0));