added error step in execute report generator procedure

litvinovg · Feb 8, 2023 · 37471fa · 37471fa
1 parent 436517e
commit 37471fa
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/...cornell/mannlib/vitro/webapp/dynapi/endpoints/ReportGeneratorEndpointIntegrationTest.java b/...cornell/mannlib/vitro/webapp/dynapi/endpoints/ReportGeneratorEndpointIntegrationTest.java
@@ -252,6 +252,17 @@ public void test() throws ConfigurationBeanLoaderException, IOException, Convers
             assertTrue(procedurePool.count() == initialProcedureCount);
         }
 
+        reportStore = new DataStore();
+        reportStore.setUser(user);
+        assertTrue(uriData != null);
+        reportStore.addData(uriData.getParam().getName(), uriData);
+        try(Procedure reportGenerator = procedurePool.getByUri("https://vivoweb.org/procedure/execute_report_generator");){
+            Parameters reportInternalParams = reportGenerator.getInternalParams();
+            Converter.convertInternalParams(reportInternalParams, reportStore);
+            OperationResult result = reportGenerator.run(reportStore);
+            assertTrue((new OperationResult(404)).equals(result));
+        }
+
         DataStore importReportStore = new DataStore() ;
         importReportStore.addData(exportedData.getParam().getName(), exportedData);
         try(Procedure importReportGenerator = procedurePool.getByUri("https://vivoweb.org/procedure/import_report_generator");){

diff --git a/...rc/main/resources/rdf/dynapiAbox/everytime/endpoint_procedure_execute_report_generator.n3 b/...rc/main/resources/rdf/dynapiAbox/everytime/endpoint_procedure_execute_report_generator.n3
@@ -41,6 +41,7 @@
  <https://vivoweb.org/procedure/execute_report_generator/condition_is_report_generator/step>
          a                                   dynapi:ConditionalStep ;
          dynapi:nextIfSatisfied              <https://vivoweb.org/procedure/execute_report_generator/call_report_generator/step> ;
+         dynapi:nextIfNotSatisfied              <https://vivoweb.org/procedure/execute_report_generator/provided_uri_is_not_report_generator/step> ;
          dynapi:hasCondition                 <https://vivoweb.org/procedure/execute_report_generator/condition_is_report_generator/condition> .       
 
 <https://vivoweb.org/procedure/execute_report_generator/condition_is_report_generator/condition>
@@ -61,6 +62,12 @@
 
 ####################################################################################################################################################################################
 
+<https://vivoweb.org/procedure/execute_report_generator/provided_uri_is_not_report_generator/step>
+        a                                   dynapi:ErrorStep ;
+        dynapi:errorCode                    "404"^^xsd:int .
+
+####################################################################################################################################################################################
+
 <https://vivoweb.org/procedure/execute_report_generator/call_report_generator/callableDescriptor>
         a                                   dynapi:ProcedureDescriptor ;
         dynapi:providesParameter            <https://vivoweb.org/procedure/execute_report_generator/parameter/report_param> ;