From 766fb4089505d4a42e4eed9dc1c78b002dd3871e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20B=C3=B6rnert?= <kai.boernert@oio.de>
Date: Wed, 10 Oct 2018 17:00:45 +0200
Subject: [PATCH] bug4768 simplified code for event creation (duplicate
 permission check)

---
 .../gateway/jaxrs/api/EventsResource.java      | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java
index 4768d833f59..07121e2d123 100644
--- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java
+++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java
@@ -414,9 +414,9 @@ public class EventsResource extends AbstractSailingServerResource {
 
                     @Override
                     public Event run() throws Exception {
-                        return createEvent(eventName, eventDescription, venueName, isPublic, startDate, endDate,
-                                officialWebsiteURL, baseURL, leaderboardGroupIds, eventId, sailorsInfoWebsiteURLs,
-                                images, videos);
+                        return getService()
+                        .apply(new CreateEvent(eventName, eventDescription, startDate, endDate, venueName, isPublic, eventId,
+                                officialWebsiteURL, baseURL, sailorsInfoWebsiteURLs, images, videos, leaderboardGroupIds));
                     }
                 });
 
@@ -525,18 +525,6 @@ public class EventsResource extends AbstractSailingServerResource {
         return getService().apply(new AddColumnToSeries(new RegattaName(regattaName), seriesName, columnName));
     }
 
-    private Event createEvent(String eventName, String eventDescription, String venueName, boolean isPublic,
-            TimePoint startDate, TimePoint endDate, URL officialWebsiteURL, URL baseURL,
-            List<UUID> leaderboardGroupIds, UUID eventId, Map<Locale, URL> sailorsInfoWebsiteURLs,
-            Iterable<ImageDescriptor> images, Iterable<VideoDescriptor> videos) {
-        if (enforceSecurityChecks) {
-            SecurityUtils.getSubject().checkPermission(SecuredDomainType.EVENT.getStringPermissionForObjects(DefaultActions.CREATE, eventName));
-        }
-        return getService()
-                .apply(new CreateEvent(eventName, eventDescription, startDate, endDate, venueName, isPublic, eventId,
-                        officialWebsiteURL, baseURL, sailorsInfoWebsiteURLs, images, videos, leaderboardGroupIds));
-    }
-    
     private void updateEvent(Event event, LeaderboardGroup leaderboardGroup){
         if (enforceSecurityChecks) {
             SecurityUtils.getSubject().checkPermission(SecuredDomainType.EVENT.getStringPermissionForObjects(DefaultActions.UPDATE, event.getId().toString()));