[DAPS-1515] Address pr comments

AronPerez · AronPerez · commit 5e9fe8f79242 · 2025-08-27T11:50:04.000-04:00
diff --git a/core/database/foxx/api/data_router.js b/core/database/foxx/api/data_router.js
@@ -8,8 +8,7 @@ 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");
+const { validateRepositorySupportsDataOperations } = require("./repository/validation");
 
 module.exports = router;
 
@@ -93,22 +92,11 @@ 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,
-                    },
-                ];
-            }
-        }
+        validateRepositorySupportsDataOperations(
+            repo_alloc._to,
+            null,
+            "Data uploads not supported for metadata-only repository",
+        );
 
         // Extension setting only apply to managed data
         if (record.ext) {
diff --git a/core/database/foxx/api/repo_router.js b/core/database/foxx/api/repo_router.js
@@ -9,7 +9,6 @@ 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");
 
 // Helper function to prepare repository data for saving
 const prepareRepoData = (obj) => {
@@ -692,21 +691,25 @@ router
                     else subject_id = g_lib.getUserFromClientID(req.queryParams.subject)._id;
 
                     // Find the repository using the new type system
-                    var findResult = RepositoryOps.find(req.queryParams.repo);
+                    const findResult = RepositoryOps.find(req.queryParams.repo);
                     if (!findResult.ok) {
                         throw [findResult.error.code, findResult.error.message];
                     }
 
-                    var repository = findResult.value;
+                    const repository = findResult.value;
 
                     // Check permissions
-                    var permResult = RepositoryOps.checkPermission(repository, client._id, "admin");
+                    const 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, {
+                    const allocResult = RepositoryOps.createAllocation(repository, {
                         subject: subject_id,
                         size: req.queryParams.data_limit,
                         rec_limit: req.queryParams.rec_limit,
diff --git a/core/database/foxx/api/repository/factory.js b/core/database/foxx/api/repository/factory.js
@@ -33,7 +33,6 @@ const g_lib = require("../support");
  * @param {string} [config.pub_key] - Public key for ZeroMQ CURVE authentication (required for GLOBUS type)
  * @param {string} [config.address] - Network address (required for GLOBUS type)
  * @param {string} [config.exp_path] - Export path (optional for GLOBUS type)
- * @param {string} [config.domain] - Domain name (required for GLOBUS type)
  * @returns {{ok: boolean, error: *}|{ok: boolean, value: *}} Result object containing repository or error
  * @see https://doc.rust-lang.org/book/ch06-02-match.html
  */
@@ -69,7 +68,6 @@ const createRepositoryByType = (config) => {
                 pub_key: config.pub_key,
                 address: config.address,
                 exp_path: config.exp_path,
-                domain: config.domain,
             });
 
             const repoData = createRepositoryData({
diff --git a/core/database/foxx/api/repository/types.js b/core/database/foxx/api/repository/types.js
@@ -71,16 +71,14 @@ const createRepositoryData = ({
  * @param {string} config.pub_key - Public key for ZeroMQ CURVE authentication
  * @param {string} config.address - Network address
  * @param {string} [config.exp_path] - Export path
- * @param {string} config.domain - Domain name
- * @returns {{endpoint: string, path: string, pub_key: string, address: string, exp_path: string, domain: string}} Globus configuration object
+ * @returns {{endpoint: string, path: string, pub_key: string, address: string, exp_path: string }} Globus configuration object
  */
-const createGlobusConfig = ({ endpoint, path, pub_key, address, exp_path, domain }) => ({
+const createGlobusConfig = ({ endpoint, path, pub_key, address, exp_path }) => ({
     endpoint,
     path,
     pub_key,
     address,
     exp_path,
-    domain,
 });
 
 /**
diff --git a/core/database/foxx/api/repository/validation.js b/core/database/foxx/api/repository/validation.js
@@ -1,6 +1,7 @@
 "use strict";
 
 const { Result } = require("./types");
+const { RepositoryOps } = require("./operations");
 const g_lib = require("../support");
 
 /**
@@ -137,11 +138,6 @@ const validateGlobusConfig = (config) => {
         errors.push(endpointValidation.error.message);
     }
 
-    const domainValidation = validateNonEmptyString(config.domain, "Domain");
-    if (!domainValidation.ok) {
-        errors.push(domainValidation.error.message);
-    }
-
     if (errors.length > 0) {
         return Result.err({
             code: g_lib.ERR_INVALID_PARAM,
@@ -175,7 +171,7 @@ const validateMetadataConfig = (config) => {
 
     // Metadata repositories don't need Globus-specific fields
     // But should not have them either
-    const invalidFields = ["pub_key", "address", "endpoint", "path", "exp_path", "domain"];
+    const invalidFields = ["pub_key", "address", "endpoint", "path", "exp_path"];
     const presentInvalidFields = invalidFields.filter((field) => config[field] !== undefined);
 
     if (presentInvalidFields.length > 0) {
@@ -215,6 +211,29 @@ const validateAllocationParams = (params) => {
     return Result.ok(true);
 };
 
+// Validates that a repository supports data operations
+const validateRepositorySupportsDataOperations = (repoId, dataId, errorMessage) => {
+    const findResult = RepositoryOps.find(repoId);
+    if (findResult.ok) {
+        const repository = findResult.value;
+        const dataOpsResult = RepositoryOps.supportsDataOperations(repository);
+
+        if (dataOpsResult.ok && !dataOpsResult.value) {
+            const defaultMessage =
+                errorMessage || `Data operations not supported for ${repository.type} repository`;
+            throw [
+                g_lib.ERR_INVALID_OPERATION,
+                defaultMessage,
+                {
+                    repo_type: repository.type,
+                    repo_id: repository.data._id,
+                    data_id: dataId,
+                },
+            ];
+        }
+    }
+};
+
 module.exports = {
     validateNonEmptyString,
     validateCommonFields,
@@ -223,4 +242,5 @@ module.exports = {
     validateGlobusConfig,
     validateMetadataConfig,
     validateAllocationParams,
+    validateRepositorySupportsDataOperations,
 };
diff --git a/core/database/foxx/api/support.js b/core/database/foxx/api/support.js
@@ -915,10 +915,10 @@ module.exports = (function () {
 
             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);
+                const findResult = RepositoryOps.find(alloc._to);
                 if (findResult.ok) {
-                    var repository = findResult.value;
-                    var dataOpsResult = RepositoryOps.supportsDataOperations(repository);
+                    const repository = findResult.value;
+                    const dataOpsResult = RepositoryOps.supportsDataOperations(repository);
 
                     // Skip metadata-only repositories
                     if (dataOpsResult.ok && !dataOpsResult.value) {
diff --git a/core/database/foxx/api/tasks.js b/core/database/foxx/api/tasks.js
@@ -3,6 +3,7 @@
 const g_lib = require("./support");
 const { UserToken } = require("./lib/user_token");
 const { RepositoryOps } = require("./repository/operations");
+const { validateRepositorySupportsDataOperations } = require("./repository/validation");
 const { RepositoryType } = require("./repository/types");
 
 const g_db = require("@arangodb").db;
@@ -13,29 +14,6 @@ var g_internal = require("internal");
 const tasks_func = (function () {
     const obj = {};
 
-    // Helper function to validate repository supports data operations
-    function validateRepositorySupportsDataOperations(loc, dataId) {
-        if (loc) {
-            const findResult = RepositoryOps.find(loc._to);
-            if (findResult.ok) {
-                const repository = findResult.value;
-                const dataOpsResult = RepositoryOps.supportsDataOperations(repository);
-
-                if (dataOpsResult.ok && !dataOpsResult.value) {
-                    throw [
-                        g_lib.ERR_INVALID_OPERATION,
-                        `Data transfers not supported for ${repository.type} repository`,
-                        {
-                            repo_type: repository.type,
-                            repo_id: repository.data._id,
-                            data_id: dataId,
-                        },
-                    ];
-                }
-            }
-        }
-    }
-
     // ----------------------- ALLOC CREATE ----------------------------
 
     obj.taskInitAllocCreate = function (
@@ -338,7 +316,13 @@ const tasks_func = (function () {
                 var data = result.glob_data[i];
                 // Get repository from data location
                 var loc = g_db.loc.firstExample({ _from: data.id });
-                validateRepositorySupportsDataOperations(loc, data.id);
+                if (loc) {
+                    validateRepositorySupportsDataOperations(
+                        loc._to,
+                        data.id,
+                        `Data transfers not supported for this repository type`,
+                    );
+                }
             }
         }
 
@@ -532,7 +516,13 @@ const tasks_func = (function () {
                 var data = result.glob_data[i];
                 // Get repository from data location
                 var loc = g_db.loc.firstExample({ _from: data.id });
-                validateRepositorySupportsDataOperations(loc, data.id);
+                if (loc) {
+                    validateRepositorySupportsDataOperations(
+                        loc._to,
+                        data.id,
+                        `Data transfers not supported for this repository type`,
+                    );
+                }
             }
         }
 
