Implemented event editing for SQL implementation.

Author: s0

java-admin-web/src/java/net/compsoc/ox/web/admin/sections/events/EditEventSection.java

@@ -73,7 +73,7 @@ public <EKey, VKey> void renderPage(PathInfo info, PageBuilder builder,
             fillFormWithData(builder, events, event);
 
             // Process form data
-            if (new EditEventFormHandler<EKey, VKey>(events, event).handle(builder))
+            if (new EditEventFormHandler<EKey, VKey>(builder, events, event).handle(builder))
                 return;
 
             NonceManager.setupNonce(builder);
@@ -139,10 +139,13 @@ private static class EditEventFormHandler<EKey, VKey> extends
         EventsAbstractFormHandler<EKey, VKey> {
 
         public final Event<EKey, VKey> event;
+        private final PageBuilder builder;
 
-        public EditEventFormHandler(Events<EKey, VKey> events, Event<EKey, VKey> event) {
+        public EditEventFormHandler(PageBuilder builder, Events<EKey, VKey> events,
+            Event<EKey, VKey> event) {
             super(events);
             this.event = event;
+            this.builder = builder;
         }
 
         @Override
@@ -155,6 +158,9 @@ public void handleData(int year, Term term, String slug, String title, String de
                 events.setTags(event.key(), tags);
             } catch (NotFoundException | InvalidKeyException e) {
                 throw new RuntimeException("Unexpected exception during event editing", e);
+            } catch (DatabaseOperationException e) {
+                builder.errors().add("Unable to update event: " + e.getMessage());
+                return;
             }
 
             throw new RedirectException(String.format("../../view/%s/", events.getKeyFactory()

java-core/src/net/compsoc/ox/database/iface/events/Events.java

@@ -30,7 +30,7 @@ public Event<Key, VenueKey> addEvent(int year, Term term, String slug, String ti
 
     public Event<Key, VenueKey> updateEvent(Key event, int year, Term term, String slug,
         String title, String description, String facebookEventId, Venue<VenueKey> venue,
-        Date start, Date end) throws NotFoundException, InvalidKeyException;
+        Date start, Date end) throws NotFoundException, InvalidKeyException, DatabaseOperationException;
 
     public void setTags(Key event, Set<Tag> tags) throws NotFoundException, InvalidKeyException;
 }

java-core/src/net/compsoc/ox/database/impl/sql/events/SQLEvents.java

@@ -125,14 +125,13 @@ public synchronized Event<Integer, String> addEvent(int year, Term term, String
             insertEvent.setDate(8, new java.sql.Date(start.getTime()));
             insertEvent.setDate(9, new java.sql.Date(end.getTime()));
 
-            if(insertEvent.executeUpdate() == 0)
+            if (insertEvent.executeUpdate() == 0)
                 throw new DatabaseOperationException("Unable to create event, zero rows affected");
 
             try (ResultSet generatedKeys = insertEvent.getGeneratedKeys()) {
                 if (generatedKeys.next()) {
-                    return(getEvent(generatedKeys.getInt(1)));
-                }
-                else {
+                    return (getEvent(generatedKeys.getInt(1)));
+                } else {
                     throw new SQLException("Creating event failed, no ID obtained.");
                 }
             } catch (NotFoundException | InvalidKeyException e) {
@@ -148,9 +147,32 @@ public synchronized Event<Integer, String> addEvent(int year, Term term, String
     @Override
     public synchronized Event<Integer, String> updateEvent(Integer event, int year, Term term,
         String slug, String title, String description, String facebookEventId, Venue<String> venue,
-        Date start, Date end) {
-        // TODO Auto-generated method stub
-        return null;
+        Date start, Date end) throws DatabaseOperationException {
+        try {
+            
+            updateEvent.setInt(1, year);
+            updateEvent.setString(2, term.name().toLowerCase());
+            updateEvent.setString(3, slug);
+            updateEvent.setString(4, title);
+            updateEvent.setString(5, description);
+            updateEvent.setString(6, facebookEventId);
+            updateEvent.setString(7, venue.key());
+            updateEvent.setDate(8, new java.sql.Date(start.getTime()));
+            updateEvent.setDate(9, new java.sql.Date(end.getTime()));
+            updateEvent.setInt(10, event.intValue());
+            
+            if (updateEvent.executeUpdate() == 0)
+                throw new DatabaseOperationException("Unable to update event, zero rows affected");
+            
+            try {
+                return (getEvent(event));
+            } catch (NotFoundException | InvalidKeyException e) {
+                throw new DatabaseOperationException("Exception fetching event after creation", e);
+            }
+            
+        } catch (SQLException e) {
+            throw new DatabaseOperationException(e);
+        }
     }
 
     @Override