Skip to content

Simplify organisation syncs #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjzondervan merged 1 commit into from
Aug 13, 2025
Merged

Simplify organisation syncs #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions lib/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
use OCA\OpenRegister\Event\ObjectLockedEvent;
use OCA\OpenRegister\Event\ObjectUnlockedEvent;
use OCA\OpenRegister\Event\ObjectRevertedEvent;
use OCP\IDBConnection;
use OCP\IUserManager;
use OCP\IGroupManager;
use OCP\IAppConfig;
Expand Down Expand Up @@ -67,13 +68,13 @@ public function __construct()
* Register event listeners and services
*
* @param IRegistrationContext $context Registration context
*
*
* @return void
*/
public function register(IRegistrationContext $context): void
{
include_once __DIR__ . '/../../vendor/autoload.php';

// Register the handlers as services
$context->registerService('OCA\SoftwareCatalog\Service\SoftwareCatalogue\OrganizationHandler', function (ContainerInterface $c) {
return new \OCA\SoftwareCatalog\Service\SoftwareCatalogue\OrganizationHandler(
Expand Down Expand Up @@ -124,10 +125,10 @@ public function register(IRegistrationContext $context): void
$context->registerEventListener(ObjectLockedEvent::class, SoftwareCatalogEventListener::class);
$context->registerEventListener(ObjectUnlockedEvent::class, SoftwareCatalogEventListener::class);
$context->registerEventListener(ObjectRevertedEvent::class, SoftwareCatalogEventListener::class);

// Organization event listeners removed - now using cron job for organization synchronization
// Contact person event listeners are still active for real-time processing

// Register new focused services
$context->registerService(\OCA\SoftwareCatalog\Service\OrganisatieService::class, function ($container) {
return new \OCA\SoftwareCatalog\Service\OrganisatieService(
Expand Down Expand Up @@ -180,7 +181,8 @@ public function register(IRegistrationContext $context): void
$container->get(SymfonyEmailService::class),
$container->get(IAppConfig::class),
$container->get('Psr\Log\LoggerInterface'),
$container->get(SettingsService::class)
$container->get(SettingsService::class),
$container->get(IDBConnection::class)
);
});

Expand Down Expand Up @@ -233,14 +235,14 @@ public function register(IRegistrationContext $context): void
* Boot the application
*
* @param IBootContext $context Boot context
*
*
* @return void
*/
public function boot(IBootContext $context): void
{
$container = $context->getServerContainer();
$logger = $container->get(LoggerInterface::class);

try {
$config = $container->get(IAppConfig::class);
$appManager = $container->get(IAppManager::class);
Expand All @@ -256,15 +258,15 @@ public function boot(IBootContext $context): void
// Check if we actually have a valid configuration, not just version matching
$needsInitialization = false;
$initReason = '';

if ($lastInitializedVersion !== $currentAppVersion || empty($lastInitializedVersion)) {
$needsInitialization = true;
$initReason = empty($lastInitializedVersion) ? 'never_initialized' : 'version_changed';
} else {
// Even if version matches, check if we have valid configuration
$hasValidConfig = $config->getValueString(self::APP_ID, 'voorzieningen_organisatie_schema', '') !== '' ||
$config->getValueString(self::APP_ID, 'organization_schema', '') !== '';

if (!$hasValidConfig) {
$needsInitialization = true;
$initReason = 'missing_configuration';
Expand All @@ -274,25 +276,25 @@ public function boot(IBootContext $context): void
]);
}
}

if ($needsInitialization) {
$logger->info('SoftwareCatalog boot: Starting initialization', [
'reason' => $initReason,
'currentVersion' => $currentAppVersion,
'lastInitializedVersion' => $lastInitializedVersion
]);

try {
$settingsService = $container->get(SettingsService::class);
$initResult = $settingsService->initialize();

$logger->info('SoftwareCatalog boot: Initialization completed', [
'result' => $initResult,
'hasErrors' => !empty($initResult['errors'])
]);

// Only update version if initialization was actually successful
if (empty($initResult['errors']) &&
if (empty($initResult['errors']) &&
($initResult['autoConfigured'] || $initResult['fullyConfigured'])) {
$config->setValueString(self::APP_ID, 'last_initialized_version', $currentAppVersion);
$logger->info('SoftwareCatalog boot: Version updated to ' . $currentAppVersion . ' (successful init)');
Expand All @@ -303,7 +305,7 @@ public function boot(IBootContext $context): void
'fullyConfigured' => $initResult['fullyConfigured'] ?? false
]);
}

} catch (\RuntimeException $e) {
// Don't update version if OpenRegister is not available
$logger->warning('SoftwareCatalog boot: OpenRegister not available during initialization', [
Expand All @@ -320,7 +322,7 @@ public function boot(IBootContext $context): void
} else {
$logger->debug('SoftwareCatalog boot: Skipping initialization (version unchanged and config valid)');
}

} catch (\Exception $e) {
// Log error but don't fail the boot process
$logger->error('SoftwareCatalog boot error during version check: ' . $e->getMessage(), [
Expand Down
Loading