Fixes template ownership issue

- Removed 'owner' property form default templates
- Set 'owner' to project creator when creating project from template

Fixes #289

Author: Orestis Tsakiridis

designer/src/main/java/org/restcomm/connect/rvd/http/resources/ProjectRestService.java

@@ -270,7 +270,7 @@ Response createProjectFromTemplate(String templateId, String projectName) throws
         // first create the restcomm application to get an appId
         ProjectApplicationsApi applicationsApi = new ProjectApplicationsApi(getUserIdentityContext(),applicationContext,restcommBaseUrl);
         String applicationId = applicationsApi.createApplication(projectName, kind.toString());
-        projectDao.createProjectFromTemplate(applicationId, template.getId(), "main", templateDao);
+        projectDao.createProjectFromTemplate(applicationId, template.getId(), "main", templateDao, getLoggedUsername() );
         // upgrade project if needed
         UpgradeService upgradeService = new UpgradeService(workspaceStorage);
         upgradeService.upgradeProject(applicationId);

designer/src/main/java/org/restcomm/connect/rvd/storage/FsProjectDao.java

@@ -117,16 +117,20 @@ public void createProject(String applicationId, ProjectState projectState) throw
      * identifier.
      *
      * Note, source path points at the project directory itself
-     *
-     * @param applicationId
+     *  @param applicationId
      * @param sourcePath
+     * @param owner
      */
     @Override
-    public void createProjectFromLocation(String applicationId, String sourcePath) throws StorageException {
+    public void createProjectFromLocation(String applicationId, String sourcePath, String owner) throws StorageException {
         // create a directory in the filesystem to host the new project
         FsProjectStorage.createProjectSlot(applicationId, workspaceStorage);
         // create state and project structure
         ProjectState projectState = workspaceStorage.loadEntity("state", sourcePath, ProjectState.class);
+        if (owner != null) {
+            projectState.getHeader().setOwner(owner);
+        }
+
         FsProjectStorage.storeProject(true, projectState, applicationId, workspaceStorage);
         // copy project settings
         try {
@@ -151,9 +155,9 @@ public void createProjectFromLocation(String applicationId, String sourcePath) t
     }
 
     @Override
-    public void createProjectFromTemplate(String applicationId, String templateId, String projectAlias, ProjectTemplateDao templateDao) throws StorageException {
+    public void createProjectFromTemplate(String applicationId, String templateId, String projectAlias, ProjectTemplateDao templateDao, String owner) throws StorageException {
         String sourceProjectPath = ((FsProjectTemplateDao)templateDao).resolveTemplateProjectPath(templateId, projectAlias);
-        createProjectFromLocation(applicationId, sourceProjectPath);
+        createProjectFromLocation(applicationId, sourceProjectPath, owner );
     }
 
     /**

designer/src/main/java/org/restcomm/connect/rvd/storage/ProjectDao.java

@@ -71,9 +71,9 @@ public interface ProjectDao {
 
     void createProject(String applicationId, ProjectState projectState) throws StorageException;
 
-    void createProjectFromLocation(String applicationId, String sourcePath ) throws StorageException;
+    void createProjectFromLocation(String applicationId, String sourcePath, String owner) throws StorageException;
 
-    void createProjectFromTemplate(String applicationId, String templateId, String projectAlias, ProjectTemplateDao templateDao) throws StorageException;
+    void createProjectFromTemplate(String applicationId, String templateId, String projectAlias, ProjectTemplateDao templateDao, String owner) throws StorageException;
 
     List<WavItem> listMedia(String applicationId) throws StorageException;
 

designer/src/main/webapp/workspace/@templates/TL1234/projects/main/state

@@ -1 +1 @@
-{"lastStepId":12,"nodes":[{"name":"start","label":"Welcome","kind":"voice","steps":[{"method":"GET","finishOnKey":"*","steps":[{"phrase":"Welcome! Enter your customer ID and press star","kind":"say","label":"say","title":"say","name":"step6"}],"collectdigits":{"next":"module1","collectVariable":"customerId","scope":"module"},"gatherType":"collectdigits","kind":"gather","label":"gather","title":"collect","name":"step4"},{"phrase":"Goodbye","kind":"say","label":"say","title":"say","name":"step12"}]},{"name":"module1","label":"Check User","kind":"voice","steps":[{"url":"/RvdExternalServicesDemo/userDetails.json","urlParams":[{"name":"customerId","value":"$customerId"}],"assignments":[{"destVariable":"firstname","scope":"application","moduleNameScope":"module2","valueExtractor":{"accessOperations":[{"kind":"object","fixed":true,"terminal":false,"expression":".firstname","action":"propertyNamed","property":"firstname"},{"kind":"value","fixed":true,"terminal":true,"expression":" value"}]}},{"destVariable":"lastname","scope":"application","moduleNameScope":"module2","valueExtractor":{"accessOperations":[{"kind":"object","fixed":true,"terminal":false,"expression":".lastname","action":"propertyNamed","property":"lastname"},{"kind":"value","fixed":true,"terminal":true,"expression":" value"}]}},{"destVariable":"error","scope":"application","moduleNameScope":"module4","valueExtractor":{"accessOperations":[{"kind":"object","fixed":true,"terminal":false,"expression":".error","action":"propertyNamed","property":"error"},{"kind":"value","fixed":true,"terminal":true,"expression":" value"}]}}],"next":"","doRouting":true,"nextType":"responseBased","nextValueExtractor":{"accessOperations":[{"kind":"object","fixed":true,"terminal":false,"expression":".nextModule","action":"propertyNamed","property":"nextModule"},{"kind":"value","fixed":true,"terminal":false,"expression":" value","action":""}]},"kind":"externalService","label":"externalService","title":"external service","name":"step7"}]},{"name":"module2","label":"Members","kind":"voice","steps":[{"phrase":"Welcome back $firstname $lastname","kind":"say","label":"say","title":"say","name":"step8"}]},{"name":"module3","label":"Guests","kind":"voice","steps":[{"phrase":"Welcome guest","kind":"say","label":"say","title":"say","name":"step11"}]},{"name":"module4","label":"Error","kind":"voice","steps":[{"phrase":"Sorry. An internal error has occured","kind":"say","label":"say","title":"say","name":"step10"}]}],"lastNodeId":4,"header":{"projectKind":"voice","startNodeName":"start","owner":"administrator@company.com","version":"1.13"}}
+{"lastStepId":12,"nodes":[{"name":"start","label":"Welcome","kind":"voice","steps":[{"method":"GET","finishOnKey":"*","steps":[{"phrase":"Welcome! Enter your customer ID and press star","kind":"say","label":"say","title":"say","name":"step6"}],"collectdigits":{"next":"module1","collectVariable":"customerId","scope":"module"},"gatherType":"collectdigits","kind":"gather","label":"gather","title":"collect","name":"step4"},{"phrase":"Goodbye","kind":"say","label":"say","title":"say","name":"step12"}]},{"name":"module1","label":"Check User","kind":"voice","steps":[{"url":"/RvdExternalServicesDemo/userDetails.json","urlParams":[{"name":"customerId","value":"$customerId"}],"assignments":[{"destVariable":"firstname","scope":"application","moduleNameScope":"module2","valueExtractor":{"accessOperations":[{"kind":"object","fixed":true,"terminal":false,"expression":".firstname","action":"propertyNamed","property":"firstname"},{"kind":"value","fixed":true,"terminal":true,"expression":" value"}]}},{"destVariable":"lastname","scope":"application","moduleNameScope":"module2","valueExtractor":{"accessOperations":[{"kind":"object","fixed":true,"terminal":false,"expression":".lastname","action":"propertyNamed","property":"lastname"},{"kind":"value","fixed":true,"terminal":true,"expression":" value"}]}},{"destVariable":"error","scope":"application","moduleNameScope":"module4","valueExtractor":{"accessOperations":[{"kind":"object","fixed":true,"terminal":false,"expression":".error","action":"propertyNamed","property":"error"},{"kind":"value","fixed":true,"terminal":true,"expression":" value"}]}}],"next":"","doRouting":true,"nextType":"responseBased","nextValueExtractor":{"accessOperations":[{"kind":"object","fixed":true,"terminal":false,"expression":".nextModule","action":"propertyNamed","property":"nextModule"},{"kind":"value","fixed":true,"terminal":false,"expression":" value","action":""}]},"kind":"externalService","label":"externalService","title":"external service","name":"step7"}]},{"name":"module2","label":"Members","kind":"voice","steps":[{"phrase":"Welcome back $firstname $lastname","kind":"say","label":"say","title":"say","name":"step8"}]},{"name":"module3","label":"Guests","kind":"voice","steps":[{"phrase":"Welcome guest","kind":"say","label":"say","title":"say","name":"step11"}]},{"name":"module4","label":"Error","kind":"voice","steps":[{"phrase":"Sorry. An internal error has occured","kind":"say","label":"say","title":"say","name":"step10"}]}],"lastNodeId":4,"header":{"projectKind":"voice","startNodeName":"start","version":"1.13"}}

designer/src/main/webapp/workspace/@templates/TL4d93e3a918ef4f89bbe5ae524c2400e8/projects/main/state

@@ -1 +1 @@
-{"lastStepId":3,"nodes":[{"name":"start","label":"Welcome","kind":"ussd","steps":[{"gatherType":"collectdigits","text":"","collectdigits":{"next":"module1","collectVariable":"friendName","scope":"application"},"messages":[{"text":"Welcome $core_From !"},{"text":"Please enter the name of your best friend :)"}],"kind":"ussdCollect","label":"USSD Collect","title":"USSD Collect","name":"step2"}]},{"name":"module1","label":"End","kind":"ussd","steps":[{"text":"So, $friendName is the friend you love the most!","kind":"ussdSay","label":"USSD Message","title":"USSD Message","name":"step3"}]}],"lastNodeId":1,"header":{"projectKind":"ussd","startNodeName":"start","version":"1.14","owner":"administrator@company.com"}}
+{"lastStepId":3,"nodes":[{"name":"start","label":"Welcome","kind":"ussd","steps":[{"gatherType":"collectdigits","text":"","collectdigits":{"next":"module1","collectVariable":"friendName","scope":"application"},"messages":[{"text":"Welcome $core_From !"},{"text":"Please enter the name of your best friend :)"}],"kind":"ussdCollect","label":"USSD Collect","title":"USSD Collect","name":"step2"}]},{"name":"module1","label":"End","kind":"ussd","steps":[{"text":"So, $friendName is the friend you love the most!","kind":"ussdSay","label":"USSD Message","title":"USSD Message","name":"step3"}]}],"lastNodeId":1,"header":{"projectKind":"ussd","startNodeName":"start","version":"1.14"}}

designer/src/main/webapp/workspace/@templates/TLfa6f0582b7b04930a25a5e763d3e3480/projects/main/state

@@ -1 +1 @@
-{"lastStepId":1,"nodes":[{"name":"start","label":"Welcome","kind":"sms","steps":[{"text":"echo: $core_Body","to":"$core_From","from":"$core_To","kind":"sms","label":"sms","title":"sms","name":"step1"}]}],"lastNodeId":0,"header":{"projectKind":"sms","startNodeName":"start","version":"1.14","owner":"administrator@company.com"}}
+{"lastStepId":1,"nodes":[{"name":"start","label":"Welcome","kind":"sms","steps":[{"text":"echo: $core_Body","to":"$core_From","from":"$core_To","kind":"sms","label":"sms","title":"sms","name":"step1"}]}],"lastNodeId":0,"header":{"projectKind":"sms","startNodeName":"start","version":"1.14"}}

designer/src/test/java/org/restcomm/connect/rvd/storage/FsProjectDaoTest.java

@@ -113,9 +113,10 @@ public void checkCreateFromLocation() throws IOException, StorageException {
         File project2 = TestUtils.createProjectWithMedia(projectName, "orestis", workspaceDir, marshaler, configuration);
 
         String clonedProject = "APclonedProject";
-        dao.createProjectFromLocation(clonedProject, project2.getPath());
+        dao.createProjectFromLocation(clonedProject, project2.getPath(), "orestis2" );
         // check everything is in place in the cloned project
         ProjectState state = dao.loadProject(clonedProject);
+        Assert.assertEquals("orestis2", state.getHeader().getOwner());
         Assert.assertNotNull(state);
         List<WavItem> media = dao.listMedia(clonedProject);
         Assert.assertEquals(2, media.size());

designer/src/test/java/org/restcomm/connect/rvd/storage/MemoryProjectDao.java

@@ -78,12 +78,12 @@ public void createProject(String applicationId, ProjectState projectState) throw
     }
 
     @Override
-    public void createProjectFromLocation(String applicationId, String sourcePath) throws StorageException {
+    public void createProjectFromLocation(String applicationId, String sourcePath, String owner) throws StorageException {
 
     }
 
     @Override
-    public void createProjectFromTemplate(String applicationId, String templateId, String projectAlias, ProjectTemplateDao templateDao) throws StorageException {
+    public void createProjectFromTemplate(String applicationId, String templateId, String projectAlias, ProjectTemplateDao templateDao, String owner) throws StorageException {
 
     }
 

testsuite/src/test/java/org/restcomm/connect/rvd/TemplatesRestServiceTest.java

@@ -55,7 +55,7 @@ public void getTemplateList() {
         Assert.assertTrue(root.isJsonObject());
         JsonElement results = root.getAsJsonObject().get("results");
         Assert.assertTrue(results.isJsonArray());
-        Assert.assertEquals(1, results.getAsJsonArray().size());
+        Assert.assertEquals(3, results.getAsJsonArray().size());
     }
 
     @Deployment(name = "TemplatesRestServiceTest", managed = true, testable = false)