Merge branch 'devel' into refactor-DAPS-1522-Query-Router-Logging-Improvements

Author: JoshuaSBrown

core/database/CMakeLists.txt

@@ -27,6 +27,8 @@ if( ENABLE_FOXX_TESTS )
   add_test(NAME foxx_path COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_foxx.sh" -t "unit_path:")
   add_test(NAME foxx_version COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_foxx.sh" -t "unit_version:")
   add_test(NAME foxx_support COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_foxx.sh" -t "unit_support:")
+  add_test(NAME foxx_user_router COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_foxx.sh" -t "unit_user_router:")
+  add_test(NAME foxx_task_router COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_foxx.sh" -t "unit_task_router:")
   add_test(NAME foxx_authz_router COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_foxx.sh" -t "unit_authz_router:")
   add_test(NAME foxx_user_router COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_foxx.sh" -t "unit_user_router:")
   add_test(NAME foxx_query_router COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_foxx.sh" -t "unit_query_router:")
@@ -53,6 +55,7 @@ if( ENABLE_FOXX_TESTS )
   set_tests_properties(foxx_path PROPERTIES FIXTURES_REQUIRED Foxx)
   set_tests_properties(foxx_user_router PROPERTIES FIXTURES_REQUIRED "Foxx;FoxxDBFixtures")
   set_tests_properties(foxx_query_router PROPERTIES FIXTURES_REQUIRED Foxx)
+  set_tests_properties(foxx_task_router PROPERTIES FIXTURES_REQUIRED Foxx)
   set_tests_properties(foxx_unit_user_token PROPERTIES FIXTURES_REQUIRED Foxx)
   set_tests_properties(foxx_unit_user_model PROPERTIES FIXTURES_REQUIRED "Foxx;FoxxDBFixtures")
   set_tests_properties(foxx_unit_globus_collection_model PROPERTIES FIXTURES_REQUIRED "Foxx;FoxxDBFixtures")

core/database/foxx/api/schemas/repo.js

@@ -0,0 +1,24 @@
+"use strict";
+
+const Joi = require("joi");
+
+const repositoryGlobusSchema = Joi.object({
+    repo_id: Joi.string().required(),
+    type: Joi.string().valid(RepositoryType.GLOBUS).required(),
+    title: Joi.string().min(1).required(),
+    desc: Joi.string().required().allow(""),
+    capacity: Joi.number().required(),
+    endpoint: Joi.string().uri().required().allow(""),
+    path: Joi.string().required().allow(""),
+    pub_key: Joi.string().required().allow(""),
+    address: Joi.string().required(),
+    exp_path: Joi.string().required().allow(""),
+});
+
+const repositoryMetadataSchema = Joi.object({
+    repo_id: Joi.string().required(),
+    type: Joi.string().valid(RepositoryType.METADATA).required(),
+    title: Joi.string().min(1).required(),
+    desc: Joi.string().required().allow(""),
+    capacity: Joi.number().required(),
+});

core/database/foxx/api/schemas/response_envelope.js

@@ -0,0 +1,31 @@
+"use strict";
+
+const { TaskSchema } = require("./task");
+
+const Joi = require("joi");
+
+const SuccessResponseDirectSchema = Joi.object({
+    execution_method: Joi.string().valid("deferred", "direct").required(),
+    result: Joi.any(),
+}).required();
+
+//
+// This function allows keeping the envelope while overwriting the
+// result with an arbitrary schema
+//
+function makeResponseDirectSchema(resultSchema) {
+    return SuccessResponseDirectSchema.keys({
+        result: resultSchema,
+    });
+}
+
+const SuccessResponseDeferredSchema = Joi.object({
+    execution_method: Joi.string().valid("deferred", "direct").required(),
+    task: TaskSchema,
+}).required();
+
+module.exports = {
+    SuccessResponseDeferredSchema,
+    SuccessResponseDirectSchema,
+    makeResponseDirectSchema,
+};

core/database/foxx/api/schemas/task.js

@@ -0,0 +1,27 @@
+"use strict";
+
+const TaskStateSchema = Joi.object({
+    repo_id: Joi.string().required(),
+    subject: Joi.string().required(),
+    data_limit: Joi.number().integer().required(),
+    rec_limit: Joi.number().integer().required(),
+    repo_path: Joi.string().required(),
+}).required();
+
+const TaskSchema = Joi.object({
+    task_id: Joi.string().required(),
+    type: Joi.number().integer().required(),
+    status: Joi.number().integer().required(),
+    msg: Joi.string().required(),
+    ct: Joi.number().integer().required(),
+    ut: Joi.number().integer().required(),
+    client: Joi.string().required(),
+    step: Joi.number().integer().required(),
+    steps: Joi.number().integer().required(),
+    state: TaskStateSchema,
+}).required();
+
+module.exports = {
+    TaskSchema,
+    TaskStateSchema,
+};