[DAPS-1515] Enhance endpoints with repository type system integration

AronPerez · AronPerez · commit adbf105dc239 · 2025-07-29T15:34:57.000Z
- Implement repository type checks for data operations.
- Replace allocation create/delete logic with RepositoryOps.
- Add support for metadata-only repositories and relevant error handling.
- Ensure API response compatibility is preserved.
diff --git a/core/database/foxx/api/data_router.js b/core/database/foxx/api/data_router.js
@@ -8,6 +8,8 @@ const g_lib = require("./support");
 const g_proc = require("./process");
 const g_tasks = require("./tasks");
 const { UserToken } = require("./lib/user_token");
+const { RepositoryOps } = require("./repository/operations");
+const { RepositoryType } = require("./repository/types");
 
 module.exports = router;
 
@@ -90,6 +92,24 @@ function recordCreate(client, record, result) {
 
         if (!repo_alloc) throw [g_lib.ERR_NO_ALLOCATION, "No allocation available"];
 
+        // Check if repository supports data operations
+        var findResult = RepositoryOps.find(repo_alloc._to);
+        if (findResult.ok) {
+            var repository = findResult.value;
+            var dataOpsResult = RepositoryOps.supportsDataOperations(repository);
+            
+            if (dataOpsResult.ok && !dataOpsResult.value) {
+                throw [
+                    g_lib.ERR_INVALID_OPERATION,
+                    "Data uploads not supported for metadata-only repository",
+                    {
+                        repo_type: repository.type,
+                        repo_id: repository.data._id
+                    }
+                ];
+            }
+        }
+
         // Extension setting only apply to managed data
         if (record.ext) {
             obj.ext_auto = false;
diff --git a/core/database/foxx/api/repo_router.js b/core/database/foxx/api/repo_router.js
@@ -8,6 +8,8 @@ const g_db = require("@arangodb").db;
 const g_lib = require("./support");
 const g_tasks = require("./tasks");
 const { validateGlobusConfig, validatePartialGlobusConfig } = require("./repository/validation");
+const { RepositoryOps } = require("./repository/operations");
+const { RepositoryType } = require("./repository/types");
 
 module.exports = router;
 
@@ -677,15 +679,33 @@ router
                         subject_id = req.queryParams.subject;
                     else subject_id = g_lib.getUserFromClientID(req.queryParams.subject)._id;
 
-                    var result = g_tasks.taskInitAllocCreate(
-                        client,
-                        req.queryParams.repo,
-                        subject_id,
-                        req.queryParams.data_limit,
-                        req.queryParams.rec_limit,
-                    );
+                    // Find the repository using the new type system
+                    var findResult = RepositoryOps.find(req.queryParams.repo);
+                    if (!findResult.ok) {
+                        throw [findResult.error.code, findResult.error.message];
+                    }
+
+                    var repository = findResult.value;
+
+                    // Check permissions
+                    var permResult = RepositoryOps.checkPermission(repository, client._id, "admin");
+                    if (!permResult.ok || !permResult.value) {
+                        throw g_lib.ERR_PERM_DENIED;
+                    }
+
+                    // Create allocation using the new system
+                    var allocResult = RepositoryOps.createAllocation(repository, {
+                        subject: subject_id,
+                        size: req.queryParams.data_limit,
+                        rec_limit: req.queryParams.rec_limit,
+                    });
+
+                    if (!allocResult.ok) {
+                        throw [allocResult.error.code, allocResult.error.message];
+                    }
 
-                    res.send(result);
+                    // Return the new response format
+                    res.send(allocResult.value);
                 },
             });
         } catch (e) {
@@ -707,7 +727,7 @@ router
     )
     .summary("Create user/project repo allocation")
     .description(
-        "Create user repo/project allocation. Only repo admin can set allocations. Returns a task document.",
+        "Create user repo/project allocation. Only repo admin can set allocations. Returns either a task (for Globus repos) or direct result (for metadata-only repos).",
     );
 
 router
@@ -727,13 +747,29 @@ router
                         subject_id = req.queryParams.subject;
                     else subject_id = g_lib.getUserFromClientID(req.queryParams.subject)._id;
 
-                    var result = g_tasks.taskInitAllocDelete(
-                        client,
-                        req.queryParams.repo,
-                        subject_id,
-                    );
+                    // Find the repository using the new type system
+                    var findResult = RepositoryOps.find(req.queryParams.repo);
+                    if (!findResult.ok) {
+                        throw [findResult.error.code, findResult.error.message];
+                    }
+
+                    var repository = findResult.value;
+
+                    // Check permissions
+                    var permResult = RepositoryOps.checkPermission(repository, client._id, "admin");
+                    if (!permResult.ok || !permResult.value) {
+                        throw g_lib.ERR_PERM_DENIED;
+                    }
+
+                    // Delete allocation using the new system
+                    var deleteResult = RepositoryOps.deleteAllocation(repository, subject_id);
+
+                    if (!deleteResult.ok) {
+                        throw [deleteResult.error.code, deleteResult.error.message];
+                    }
 
-                    res.send(result);
+                    // Return the new response format
+                    res.send(deleteResult.value);
                 },
             });
         } catch (e) {
@@ -745,7 +781,7 @@ router
     .queryParam("repo", joi.string().required(), "Repo ID")
     .summary("Delete user/project repo allocation")
     .description(
-        "Delete user repo/project allocation. Only repo admin can set allocations. Returns a task document.",
+        "Delete user repo/project allocation. Only repo admin can set allocations. Returns either a task (for Globus repos) or direct result (for metadata-only repos).",
     );
 
 router
diff --git a/core/database/foxx/api/support.js b/core/database/foxx/api/support.js
@@ -7,6 +7,10 @@ module.exports = (function () {
 
     obj.db = require("@arangodb").db;
     obj.graph = require("@arangodb/general-graph")._graph("sdmsg");
+    
+    // Import repository type system
+    const { RepositoryOps } = require("./repository/operations");
+    const { RepositoryType } = require("./repository/types");
 
     obj.PERM_RD_REC = 0x0001; // Read record info (description, keywords, details)
     obj.PERM_RD_META = 0x0002; // Read structured metadata
@@ -164,6 +168,8 @@ module.exports = (function () {
     obj.ERR_INFO.push([400, "No allocation available"]);
     obj.ERR_ALLOCATION_EXCEEDED = obj.ERR_COUNT++;
     obj.ERR_INFO.push([400, "Storage allocation exceeded"]);
+    obj.ERR_INVALID_OPERATION = obj.ERR_COUNT++;
+    obj.ERR_INFO.push([400, "Invalid operation"]);
 
     obj.CHARSET_ID = 0;
     obj.CHARSET_ALIAS = 1;
@@ -910,6 +916,18 @@ module.exports = (function () {
             alloc = allocs[i];
 
             if (alloc.data_size < alloc.data_limit && alloc.rec_count < alloc.rec_limit) {
+                // Check if repository supports data operations
+                var findResult = RepositoryOps.find(alloc._to);
+                if (findResult.ok) {
+                    var repository = findResult.value;
+                    var dataOpsResult = RepositoryOps.supportsDataOperations(repository);
+                    
+                    // Skip metadata-only repositories
+                    if (dataOpsResult.ok && !dataOpsResult.value) {
+                        continue;
+                    }
+                }
+                
                 return alloc;
             }
         }
@@ -936,6 +954,24 @@ module.exports = (function () {
                 "Allocation record count exceeded (max: " + alloc.rec_limit + ")",
             ];
 
+        // Check if repository supports data operations
+        var findResult = RepositoryOps.find(a_repo_id);
+        if (findResult.ok) {
+            var repository = findResult.value;
+            var dataOpsResult = RepositoryOps.supportsDataOperations(repository);
+            
+            if (dataOpsResult.ok && !dataOpsResult.value) {
+                throw [
+                    obj.ERR_INVALID_OPERATION,
+                    "Data operations not supported for metadata-only repository",
+                    {
+                        repo_type: repository.type,
+                        repo_id: repository.data._id
+                    }
+                ];
+            }
+        }
+
         return alloc;
     };
 
diff --git a/core/database/foxx/api/tasks.js b/core/database/foxx/api/tasks.js
@@ -3,6 +3,8 @@
 // local imports
 const g_lib = require("./support");
 const { UserToken } = require("./lib/user_token");
+const { RepositoryOps } = require("./repository/operations");
+const { RepositoryType } = require("./repository/types");
 
 const g_db = require("@arangodb").db;
 const g_graph = require("@arangodb/general-graph")._graph("sdmsg");
@@ -308,6 +310,34 @@ var tasks_func = (function () {
 
         var result = g_proc.preprocessItems(a_client, null, a_res_ids, g_lib.TT_DATA_GET);
 
+        // Check repository types for all Globus data items
+        if (result.glob_data.length > 0) {
+            for (var i = 0; i < result.glob_data.length; i++) {
+                var data = result.glob_data[i];
+                // Get repository from data location
+                var loc = g_db.loc.firstExample({ _from: data.id });
+                if (loc) {
+                    var findResult = RepositoryOps.find(loc._to);
+                    if (findResult.ok) {
+                        var repository = findResult.value;
+                        var dataOpsResult = RepositoryOps.supportsDataOperations(repository);
+                        
+                        if (dataOpsResult.ok && !dataOpsResult.value) {
+                            throw [
+                                g_lib.ERR_INVALID_OPERATION,
+                                "Data transfers not supported for metadata-only repository",
+                                {
+                                    repo_type: repository.type,
+                                    repo_id: repository.data._id,
+                                    data_id: data.id
+                                }
+                            ];
+                        }
+                    }
+                }
+            }
+        }
+
         if (result.glob_data.length + result.ext_data.length > 0 && !a_check) {
             var idx = a_path.indexOf("/");
             if (idx == -1)
@@ -492,6 +522,34 @@ var tasks_func = (function () {
 
         var result = g_proc.preprocessItems(a_client, null, a_res_ids, g_lib.TT_DATA_PUT);
 
+        // Check repository types for all Globus data items
+        if (result.glob_data.length > 0) {
+            for (var i = 0; i < result.glob_data.length; i++) {
+                var data = result.glob_data[i];
+                // Get repository from data location
+                var loc = g_db.loc.firstExample({ _from: data.id });
+                if (loc) {
+                    var findResult = RepositoryOps.find(loc._to);
+                    if (findResult.ok) {
+                        var repository = findResult.value;
+                        var dataOpsResult = RepositoryOps.supportsDataOperations(repository);
+                        
+                        if (dataOpsResult.ok && !dataOpsResult.value) {
+                            throw [
+                                g_lib.ERR_INVALID_OPERATION,
+                                "Data transfers not supported for metadata-only repository",
+                                {
+                                    repo_type: repository.type,
+                                    repo_id: repository.data._id,
+                                    data_id: data.id
+                                }
+                            ];
+                        }
+                    }
+                }
+            }
+        }
+
         if (result.glob_data.length > 0 && !a_check) {
             var idx = a_path.indexOf("/");
             if (idx == -1)
