Added back-end unit tests for all controllers, services and more + fixes

lib/Controller/ObjectsController.php

@@ -150,9 +150,9 @@ private function isCurrentUserAdmin(): bool
     public function page(): TemplateResponse
     {
         return new TemplateResponse(
-            appName: 'openconnector',
-            templateName: 'index',
-            parameters: []
+            'openconnector',
+            'index',
+            []
         );
 
     }//end page()
@@ -1219,7 +1219,7 @@ public function unlock(string $register, string $schema, string $id): JSONRespon
     {
         $this->objectService->setRegister($register);
         $this->objectService->setSchema($schema);
-        $this->objectService->unlock($id);
+        $this->objectService->unlockObject($id);
         return new JSONResponse(['message' => 'Object unlocked successfully']);
 
     }//end unlock()

lib/Controller/SchemasController.php

@@ -70,6 +70,7 @@ public function __construct(
         private readonly SchemaMapper $schemaMapper,
         private readonly ObjectEntityMapper $objectEntityMapper,
         private readonly DownloadService $downloadService,
+        private readonly ObjectService $objectService,
         private readonly UploadService $uploadService,
         private readonly AuditTrailMapper $auditTrailMapper,
         private readonly OrganisationService $organisationService,
@@ -95,9 +96,9 @@ public function __construct(
     public function page(): TemplateResponse
     {
         return new TemplateResponse(
-            appName: 'openconnector',
-            templateName: 'index',
-            parameters: []
+            'openconnector',
+            'index',
+            []
         );
 
     }//end page()

lib/Controller/SourcesController.php

@@ -21,8 +21,8 @@
 use OCA\OpenRegister\Db\Source;
 use OCA\OpenRegister\Db\SourceMapper;
 use OCA\OpenRegister\Service\ObjectService;
-use OCA\OpenRegister\Service\SearchService;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\DB\Exception;
@@ -85,7 +85,6 @@ public function page(): TemplateResponse
      * This method returns a JSON response containing an array of all sources in the system.
      *
      * @param ObjectService $objectService The object service
-     * @param SearchService $searchService The search service
      *
      * @return JSONResponse A JSON response containing the list of sources
      *
@@ -94,20 +93,29 @@ public function page(): TemplateResponse
      * @NoCSRFRequired
      */
     public function index(
-        ObjectService $objectService,
-        SearchService $searchService
+        ObjectService $objectService
     ): JSONResponse {
         // Get request parameters for filtering and searching.
-        $filters        = $this->request->getParams();
-        $fieldsToSearch = ['title', 'description'];
-
-        // Create search parameters and conditions for filtering.
-        $searchParams     = $searchService->createMySQLSearchParams(filters: $filters);
-        $searchConditions = $searchService->createMySQLSearchConditions(
-            filters: $filters,
-            fieldsToSearch: $fieldsToSearch
-        );
-        $filters          = $searchService->unsetSpecialQueryParams(filters: $filters);
+        $filters = $this->request->getParams();
+
+        // Create simple search conditions for title and description fields
+        $searchConditions = [];
+        $searchParams = [];
+
+        if (isset($filters['search']) || isset($filters['q'])) {
+            $searchTerm = $filters['search'] ?? $filters['q'] ?? '';
+            if (!empty($searchTerm)) {
+                $searchConditions[] = '(title LIKE ? OR description LIKE ?)';
+                $searchParams[] = '%' . $searchTerm . '%';
+                $searchParams[] = '%' . $searchTerm . '%';
+            }
+        }
+
+        // Remove special query parameters that are not database fields
+        $specialParams = ['limit', 'offset', 'sort', 'order', 'search', 'q'];
+        foreach ($specialParams as $param) {
+            unset($filters[$param]);
+        }
 
         // Return all sources that match the search conditions.
         return new JSONResponse(

lib/Db/Register.php

@@ -377,5 +377,16 @@ public function __toString(): string
 
     }//end __toString()
 
+    /**
+     * Get the unique identifier for the register
+     * Override parent method since this class uses 'uuid' instead of 'id'
+     *
+     * @return string|null The unique identifier
+     */
+    public function getId(): ?string
+    {
+        return $this->uuid;
+    }//end getId()
+
 
 }//end class

lib/Db/Schema.php

@@ -762,6 +762,18 @@ public function getIcon(): ?string
     }//end getIcon()
 
 
+    /**
+     * Get the hard validation setting for the schema
+     *
+     * @return bool Whether hard validation is enabled
+     */
+    public function getHardValidation(): bool
+    {
+        return $this->hardValidation;
+
+    }//end getHardValidation()
+
+
     /**
      * Set the icon for the schema
      *
@@ -964,6 +976,36 @@ public function __toString(): string
 
     }//end __toString()
 
+    /**
+     * Get the unique identifier for the schema
+     * Override parent method since this class uses 'uuid' instead of 'id'
+     *
+     * @return string|null The unique identifier
+     */
+    public function getId(): ?string
+    {
+        return $this->uuid;
+    }//end getId()
+
+    /**
+     * Get the title of the schema
+     * 
+     * @return string|null The schema title
+     */
+    public function getTitle(): ?string
+    {
+        return $this->title;
+    }//end getTitle()
+
+    /**
+     * Get the slug of the schema
+     * 
+     * @return string|null The schema slug
+     */
+    public function getSlug(): ?string
+    {
+        return $this->slug;
+    }//end getSlug()
 
     /**
      * Get the pre-computed facet configuration

lib/Db/SchemaMapper.php

@@ -823,4 +823,17 @@ private function determineFacetTypeFromProperty(array $property): string
     }//end determineFacetTypeFromProperty()
 
 
+    /**
+     * Get register count for a schema
+     *
+     * @param int $schemaId The schema ID
+     * @return int Register count
+     */
+    public function getRegisterCount(int $schemaId): int
+    {
+        $counts = $this->getRegisterCountPerSchema();
+        return $counts[$schemaId] ?? 0;
+    }//end getRegisterCount()
+
+
 }//end class

lib/Exception/LockedException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace OCA\OpenRegister\Exception;
+
+use Exception;
+
+class LockedException extends Exception
+{
+}

lib/Formats/BsnFormat.php

@@ -35,17 +35,33 @@ class BsnFormat implements Format
      */
     public function validate(mixed $data): bool
     {
-        $data = str_pad(
-            string: $data,
-            length:9,
-            pad_string: "0",
-            pad_type: STR_PAD_LEFT,
-        );
+        if ($data === null || $data === '') {
+            return false;
+        }
+
+        // Only accept strings and numeric values that can be meaningfully converted
+        if (is_string($data) === false && is_numeric($data) === false) {
+            return false;
+        }
+
+        $dataString = (string) $data;
+
+        // Reject numbers that are not exactly 9 digits
+        if (strlen($dataString) !== 9) {
+            return false;
+        }
+
+        $data = $dataString;
 
         if (ctype_digit($data) === false) {
             return false;
         }
 
+        // Reject all-zero BSNs (000000000)
+        if ($data === '000000000') {
+            return false;
+        }
+
         $control          = 0;
         $reversedIterator = 9;
         foreach (str_split($data) as $character) {

lib/Service/ImportService.php

@@ -32,7 +32,7 @@
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use Psr\Log\LoggerInterface;
-use React\Async\PromiseInterface;
+use React\Promise\PromiseInterface;
 use React\Promise\Promise;
 use React\EventLoop\Loop;
 
@@ -618,38 +618,49 @@ private function processSpreadsheetBatch(
         // Call saveObjects ONCE with all objects - NO ERROR SUPPRESSION!
         // This will reveal the real bulk save problem immediately
         if (!empty($allObjects) && $register !== null && $schema !== null) {
-            // Add publish date to all objects if publish is enabled
-            if ($publish) {
-                $publishDate = (new \DateTime())->format('c'); // ISO 8601 format
-                $allObjects = $this->addPublishedDateToObjects($allObjects, $publishDate);
-            }
-
-            $saveResult = $this->objectService->saveObjects($allObjects, $register, $schema, $rbac, $multi, $validation, $events);
-
-            // Use the structured return from saveObjects with smart deduplication
-            // saveObjects returns ObjectEntity->jsonSerialize() arrays where UUID is in @self.id
-            $summary['created'] = array_map(fn($obj) => $obj['@self']['id'] ?? $obj['uuid'] ?? $obj['id'] ?? null, $saveResult['saved'] ?? []);
-            $summary['updated'] = array_map(fn($obj) => $obj['@self']['id'] ?? $obj['uuid'] ?? $obj['id'] ?? null, $saveResult['updated'] ?? []);
-
-            // TODO: Handle unchanged objects from smart deduplication (renamed from 'skipped')
-            $summary['unchanged'] = array_map(fn($obj) => $obj['@self']['id'] ?? $obj['uuid'] ?? $obj['id'] ?? null, $saveResult['unchanged'] ?? []);
-
-            // Add efficiency metrics from smart deduplication
-            $totalProcessed = count($summary['created']) + count($summary['updated']) + count($summary['unchanged']);
-            if ($totalProcessed > 0 && count($summary['unchanged']) > 0) {
-                $summary['deduplication_efficiency'] = round((count($summary['unchanged']) / $totalProcessed) * 100, 1) . '% operations avoided';
-            }
-
-            // Handle validation errors if validation was enabled
-            if ($validation && !empty($saveResult['invalid'] ?? [])) {
-                foreach (($saveResult['invalid'] ?? []) as $invalidItem) {
-                    $summary['errors'][] = [
-                        'sheet' => $sheetTitle,
-                        'object' => $invalidItem['object'] ?? $invalidItem,
-                        'error' => $invalidItem['error'] ?? 'Validation failed',
-                        'type'  => $invalidItem['type'] ?? 'ValidationException',
-                    ];
+            try {
+                // Add publish date to all objects if publish is enabled
+                if ($publish) {
+                    $publishDate = (new \DateTime())->format('c'); // ISO 8601 format
+                    $allObjects = $this->addPublishedDateToObjects($allObjects, $publishDate);
+                }
+
+                $saveResult = $this->objectService->saveObjects($allObjects, $register, $schema, $rbac, $multi, $validation, $events);
+
+                // Use the structured return from saveObjects with smart deduplication
+                // saveObjects returns ObjectEntity->jsonSerialize() arrays where UUID is in @self.id
+                $summary['created'] = array_map(fn($obj) => $obj['@self']['id'] ?? $obj['uuid'] ?? $obj['id'] ?? null, $saveResult['saved'] ?? []);
+                $summary['updated'] = array_map(fn($obj) => $obj['@self']['id'] ?? $obj['uuid'] ?? $obj['id'] ?? null, $saveResult['updated'] ?? []);
+
+                // TODO: Handle unchanged objects from smart deduplication (renamed from 'skipped')
+                $summary['unchanged'] = array_map(fn($obj) => $obj['@self']['id'] ?? $obj['uuid'] ?? $obj['id'] ?? null, $saveResult['unchanged'] ?? []);
+
+                // Add efficiency metrics from smart deduplication
+                $totalProcessed = count($summary['created']) + count($summary['updated']) + count($summary['unchanged']);
+                if ($totalProcessed > 0 && count($summary['unchanged']) > 0) {
+                    $summary['deduplication_efficiency'] = round((count($summary['unchanged']) / $totalProcessed) * 100, 1) . '% operations avoided';
+                }
+
+                // Handle validation errors if validation was enabled
+                if ($validation && !empty($saveResult['invalid'] ?? [])) {
+                    foreach (($saveResult['invalid'] ?? []) as $invalidItem) {
+                        $summary['errors'][] = [
+                            'sheet' => $sheetTitle,
+                            'object' => $invalidItem['object'] ?? $invalidItem,
+                            'error' => $invalidItem['error'] ?? 'Validation failed',
+                            'type'  => $invalidItem['type'] ?? 'ValidationException',
+                        ];
+                    }
                 }
+            } catch (\Exception $e) {
+                // Handle batch save errors
+                $summary['errors'][] = [
+                    'sheet' => $sheetTitle,
+                    'row' => 'batch',
+                    'object' => [],
+                    'error' => 'Batch save failed: ' . $e->getMessage(),
+                    'type' => 'BatchSaveException',
+                ];
             }
         }