Add fields Event Description & Type to fix #11 and #20, test for #1

sapmentors · Oct 30, 2016 · 565243c · 565243c
1 parent 968a74d
commit 565243c
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 18 deletions.
diff --git a/data/SITreg.hdbdd b/data/SITreg.hdbdd
@@ -28,6 +28,7 @@ context SITreg {
     type BusinessKey    : Integer;
     type UserT          : String(256);
     type RelationToSAPT : String(1);
+    type EventTypeT     : String(1);
     type SDate          : LocalDate;
     type URL            : String(256);
     type TicketUsedT    : String(1) enum{ YES = 'Y'; NO = 'N'; };
@@ -62,6 +63,8 @@ context SITreg {
             MaxParticipants : Integer not null;
             HomepageURL     : URL;
             History         : HistoryT;
+            Description     : String(100);
+            Type            : EventTypeT;
     };
 
     entity CoOrganizer {

diff --git a/odataorganizer/procedures/EventCreate.hdbprocedure b/odataorganizer/procedures/EventCreate.hdbprocedure
@@ -35,6 +35,8 @@ BEGIN
     DECLARE lv_CreatedAt       string;
     DECLARE lv_ChangedBy       string;
     DECLARE lv_ChangedAt       string;
+    DECLARE lv_Description     string;
+    DECLARE lv_Type            string;
 
     SELECT * INTO lv_ID             
             , lv_Location       
@@ -46,7 +48,9 @@ BEGIN
             , lv_CreatedBy      
             , lv_CreatedAt      
             , lv_ChangedBy      
-            , lv_ChangedAt 
+            , lv_ChangedAt
+            , lv_Description
+            , lv_Type
         FROM :inrow;
 
     -- Don't trust the provided Username. we read it from the current user
@@ -59,17 +63,19 @@ BEGIN
 		FROM dummy;
 
 	INSERT INTO "com.sap.sapmentors.sitreg.data::SITreg.Event" 
-	    VALUES(lv_ID
-	    , lv_Location
-	    , lv_EventDate
-	    , lv_StartTime
-	    , lv_EndTime
-	    , lv_MaxParticipants
-	    , lv_HomepageURL
-	    , lv_CreatedBy
-	    , CURRENT_TIMESTAMP
-	    , lv_CreatedBy
-	    , CURRENT_TIMESTAMP
+        VALUES(lv_ID
+        , lv_Location
+        , lv_EventDate
+        , lv_StartTime
+        , lv_EndTime
+        , lv_MaxParticipants
+        , lv_HomepageURL
+        , lv_CreatedBy
+        , CURRENT_TIMESTAMP
+        , lv_CreatedBy
+        , CURRENT_TIMESTAMP
+        , lv_Description
+        , lv_Type
 	    );
 	-- Procedures for XSODATA are expected to fill the error sturcture
 	-- TODO: Find a better solution for 1 = 2

diff --git a/odataorganizer/procedures/EventUpdate.hdbprocedure b/odataorganizer/procedures/EventUpdate.hdbprocedure
@@ -37,14 +37,17 @@ BEGIN
     DECLARE lv_CreatedAt       DATE;
     DECLARE lv_ChangedBy       string;
     DECLARE lv_ChangedAt       DATE;
+    DECLARE lv_Description     string;
+    DECLARE lv_Type            string;
 
     DECLARE lv_Location_tmp        string;
     DECLARE lv_EventDate_tmp       DATE;
     DECLARE lv_StartTime_tmp       TIMESTAMP;
     DECLARE lv_EndTime_tmp         TIMESTAMP;
     DECLARE lv_MaxParticipants_tmp INTEGER;
     DECLARE lv_HomepageURL_tmp     string;
-
+    DECLARE lv_Description_tmp     string;
+    DECLARE lv_Type_tmp            string;
 
     SELECT * INTO lv_ID             
             , lv_Location       
@@ -57,6 +60,8 @@ BEGIN
             , lv_CreatedAt      
             , lv_ChangedBy      
             , lv_ChangedAt
+            , lv_Description
+            , lv_Type
         FROM :inrow;
     -- Don't trust the provided Username. We read it from the current user
     SELECT CURRENT_USER INTO lv_ChangedBy FROM DUMMY;
@@ -74,13 +79,18 @@ BEGIN
     END IF;
 
     IF lv_Count = 1 THEN
-        SELECT "Location", "EventDate", "StartTime", "EndTime", "MaxParticipants", "HomepageURL"
+        SELECT "Location", "EventDate", 
+            "StartTime", "EndTime", 
+            "MaxParticipants", "HomepageURL",
+            "Description", "Type"
             INTO lv_Location_tmp      
                 , lv_EventDate_tmp      
                 , lv_StartTime_tmp      
                 , lv_EndTime_tmp        
                 , lv_MaxParticipants_tmp
-                , lv_HomepageURL_tmp    
+                , lv_HomepageURL_tmp
+                , lv_Description_tmp
+                , lv_Type_tmp
             FROM "com.sap.sapmentors.sitreg.data::SITreg.Event"
             WHERE "ID" = lv_ID;
         -- OData call can also contain just single attributes. We have to preserve the data
@@ -90,6 +100,8 @@ BEGIN
         if lv_EndTime = ''        then lv_EndTime = lv_EndTime_tmp;                 END IF;
         if lv_MaxParticipants = 0 then lv_MaxParticipants = lv_MaxParticipants_tmp; END IF;
         if lv_HomepageURL = ''    then lv_HomepageURL = lv_HomepageURL_tmp;         END IF;
+        if lv_Description = ''    then lv_Description = lv_Description_tmp;         END IF;
+        if lv_Type = ''           then lv_Type = lv_Type_tmp;                       END IF;
 
         IF lv_MaxParticipants <> lv_MaxParticipants_tmp THEN
             -- When MaxParticipants is changed, the Waiting List must be updated
@@ -108,6 +120,8 @@ BEGIN
               , "HomepageURL"     = lv_HomepageURL
               , "History.ChangedBy" = lv_ChangedBy
               , "History.ChangedAt" = CURRENT_TIMESTAMP
+              , "Description"       = lv_Description
+              , "Type"              = lv_Type
           WHERE "ID" = lv_ID;
 
     ELSE

diff --git a/roles/organizer.hdbrole b/roles/organizer.hdbrole
@@ -1,5 +1,4 @@
 role com.sap.sapmentors.sitreg.roles::organizer {
-    // catalog schema "SITREG": SELECT;
     sql object com.sap.sapmentors.sitreg.data::eventId: SELECT;
     sql object com.sap.sapmentors.sitreg.data::SITreg.Event: SELECT, INSERT, UPDATE;
     sql object com.sap.sapmentors.sitreg.odataorganizer.procedures::EventCreate: EXECUTE;

diff --git a/test/spec/Organizer.js b/test/spec/Organizer.js
@@ -28,7 +28,8 @@ describe("Create event", function() {
             "München",
             "/Date(1475798400000)/",
             "/Date(1475910000000)/",
-            "/Date(1475942400000)/"
+            "/Date(1475942400000)/",
+            "SAP Inside Track"
         );
         expect(xhr.status).toBe(201);
         expect(xhr.statusText).toBe("Created");
@@ -37,7 +38,8 @@ describe("Create event", function() {
             "Bern",
             "/Date(1472774400000)/",
             "/Date(1472889600000)/",
-            "/Date(1472911200000)/"
+            "/Date(1472911200000)/",
+            "早上好"
         );
         expect(xhr.status).toBe(201);
         expect(xhr.statusText).toBe("Created");
@@ -62,6 +64,8 @@ describe("Read event and change MaxParticipants", function() {
         expect(xhr.statusText).toBe("OK");
         var body = xhr.responseText ? JSON.parse(xhr.responseText) : "";
         expect(body.d.results[0].Location).toBe("München");
+        expect(body.d.results[0].Description).toBe("SAP Inside Track");
+        expect(body.d.results[1].Description).toBe("早上好");
         // Change MaxParticipants
         eventUri = body.d.results[0].__metadata.uri;
         eventUri2 = body.d.results[1].__metadata.uri;