Resolve commented issues

Author: VirajSalaka

gateway/gateway-controller/cmd/controller/main.go

@@ -121,9 +121,10 @@ func main() {
 				log.Fatal("Failed to initialize EventHub", zap.Error(err))
 			}
 			if err := eventHub.RegisterOrganization("default"); err != nil {
-				log.Fatal("Failed to register default organization", zap.Error(err))
+				log.Error("Failed to register default organization", zap.Error(err))
+			} else {
+				log.Info("EventHub initialized successfully")
 			}
-			log.Info("EventHub initialized successfully")
 		} else {
 			log.Fatal("EventHub requires persistent storage. Multi-replica mode will not function correctly in memory-only mode.")
 		}

gateway/gateway-controller/pkg/eventhub/sqlite_backend.go

@@ -301,8 +301,7 @@ func (b *SQLiteBackend) pollAllOrganizations() {
 		}
 
 		if len(events) > 0 {
-			 		if len(events) > 0 {
-			if b.deliverEvents(org, events) != nil{
+			if b.deliverEvents(org, events) == nil{
 				org.updatePollState(state.VersionID, time.Now())
 			}
 			// If delivery failed (channel full), don't update timestamp
@@ -311,9 +310,6 @@ func (b *SQLiteBackend) pollAllOrganizations() {
 			org.updatePollState(state.VersionID, time.Now())
 		}
 	}
-
-		org.updatePollState(state.VersionID, time.Now())
-	}
 }
 
 // getAllStates retrieves all organization states

gateway/gateway-controller/pkg/storage/gateway-controller-db.sql

@@ -165,14 +165,17 @@ CREATE INDEX IF NOT EXISTS idx_organization_states_updated ON organization_state
 CREATE TABLE IF NOT EXISTS events (
     organization_id TEXT NOT NULL,
     processed_timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    processed_timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     originated_timestamp TIMESTAMP NOT NULL,
     event_type TEXT NOT NULL,
     action TEXT NOT NULL CHECK(action IN ('CREATE', 'UPDATE', 'DELETE')),
     entity_id TEXT NOT NULL,
-    correlation_id TEXT NOT NULL DEFAULT '',
+    correlation_id TEXT NOT NULL,
     event_data TEXT NOT NULL,
-    PRIMARY KEY (organization_id, processed_timestamp)
+    PRIMARY KEY (correlation_id)
 );
 
+CREATE INDEX IF NOT EXISTS idx_events_org_time ON events(organization_id, processed_timestamp);
+
 -- Set schema version to 6
 PRAGMA user_version = 6;

gateway/gateway-controller/pkg/storage/sqlite.go

@@ -239,13 +239,17 @@ func (s *SQLiteStorage) initSchema() error {
 				event_type TEXT NOT NULL,
 				action TEXT NOT NULL CHECK(action IN ('CREATE', 'UPDATE', 'DELETE')),
 				entity_id TEXT NOT NULL,
-				correlation_id TEXT NOT NULL DEFAULT '',
+				correlation_id TEXT NOT NULL,
 				event_data TEXT NOT NULL,
-				PRIMARY KEY (organization_id, processed_timestamp)
+				PRIMARY KEY (correlation_id)
 			);`); err != nil {
 				return fmt.Errorf("failed to create events table: %w", err)
 			}
 
+			if _, err := s.db.Exec(`CREATE INDEX IF NOT EXISTS idx_events_org_time ON events(organization_id, processed_timestamp);`); err != nil {
+				return fmt.Errorf("failed to create events organization-time index: %w", err)
+			}
+
 			if _, err := s.db.Exec("PRAGMA user_version = 6"); err != nil {
 				return fmt.Errorf("failed to set schema version to 6: %w", err)
 			}