Update config_provider.py

config_provider.py

@@ -10,6 +10,7 @@ from datetime import datetime
 from pathlib import Path
 import tempfile
 import shutil
+from utils import get_current_timestamp, timestamps_equal
 
 from config_models import (
     ServiceConfig, GlobalConfig, ProjectConfig, VersionConfig, 
@@ -168,7 +169,7 @@ class ConfigProvider:
                         )
                 
                 # Update metadata
-                config.last_update_date = datetime.utcnow().isoformat() + 'Z'
+                config.last_update_date = get_current_timestamp()
                 config.last_update_user = username
                 
                 # Convert to JSON
@@ -252,7 +253,7 @@ class ConfigProvider:
             # Create project
             project = ProjectConfig(
                 id=config.project_id_counter,
-                created_date=datetime.utcnow().isoformat() + 'Z',
+                created_date=get_current_timestamp(),
                 created_by=username,
                 **project_data
             )
@@ -291,31 +292,22 @@ class ConfigProvider:
             
             # Check race condition
             if expected_last_update is not None and expected_last_update != '':
-                if project.last_update_date:
-                    # Datetime objesini string'e çevir
-                    actual_date_str = project.last_update_date.isoformat() if isinstance(project.last_update_date, datetime) else str(project.last_update_date)
-                    
-                    # Tarihleri normalize et
-                    expected_normalized = cls._normalize_date(expected_last_update)
-                    actual_normalized = cls._normalize_date(actual_date_str)
-                    
-                    if expected_normalized != actual_normalized:
-                        log_info(f"🔍 Date mismatch - Expected: {expected_normalized}, Actual: {actual_normalized}")
-                        raise RaceConditionError(
-                            f"Project '{project.name}' was modified by another user",
-                            current_user=username,
-                            last_update_user=project.last_update_user,
-                            last_update_date=project.last_update_date,
-                            entity_type="project",
-                            entity_id=project_id
-                        )
+                if project.last_update_date and not timestamps_equal(expected_last_update, project.last_update_date):
+                    raise RaceConditionError(
+                        f"Project '{project.name}' was modified by another user",
+                        current_user=username,
+                        last_update_user=project.last_update_user,
+                        last_update_date=project.last_update_date,
+                        entity_type="project",
+                        entity_id=project_id
+                    )
             
             # Update fields
             for key, value in update_data.items():
                 if hasattr(project, key) and key not in ['id', 'created_date', 'created_by', 'last_update_date', 'last_update_user']:
                     setattr(project, key, value)
             
-            project.last_update_date = datetime.utcnow().isoformat() + 'Z'
+            project.last_update_date = get_current_timestamp()
             project.last_update_user = username
             
             # Log activity
@@ -346,7 +338,7 @@ class ConfigProvider:
                 raise ResourceNotFoundError("project", project_id)
             
             project.deleted = True
-            project.last_update_date = datetime.utcnow().isoformat() + 'Z'
+            project.last_update_date = get_current_timestamp()
             project.last_update_user = username
             
             # Log activity
@@ -379,7 +371,7 @@ class ConfigProvider:
             # Create version
             version = VersionConfig(
                 no=project.version_id_counter,
-                created_date=datetime.utcnow().isoformat() + 'Z',
+                created_date=get_current_timestamp(),
                 created_by=username,
                 **version_data
             )
@@ -387,7 +379,7 @@ class ConfigProvider:
             # Update project
             project.versions.append(version)
             project.version_id_counter += 1
-            project.last_update_date = datetime.utcnow().isoformat() + 'Z'
+            project.last_update_date = get_current_timestamp()
             project.last_update_user = username
             
             # Log activity
@@ -430,11 +422,11 @@ class ConfigProvider:
             
             # Publish this version
             version.published = True
-            version.publish_date = datetime.utcnow().isoformat() + 'Z'
+            version.publish_date = get_current_timestamp()
             version.published_by = username
             
             # Update project
-            project.last_update_date = datetime.utcnow().isoformat() + 'Z'
+            project.last_update_date = get_current_timestamp()
             project.last_update_user = username
             
             # Log activity
@@ -476,31 +468,26 @@ class ConfigProvider:
             
             # Check race condition
             if expected_last_update is not None and expected_last_update != '':
-                if version.last_update_date:
-                    # Tarihleri normalize et
-                    expected_normalized = cls._normalize_date(expected_last_update)
-                    actual_normalized = cls._normalize_date(version.last_update_date)
-                    
-                    if expected_normalized != actual_normalized:
-                        raise RaceConditionError(
-                            f"Version {version_no} was modified by another user",
-                            current_user=username,
-                            last_update_user=version.last_update_user,
-                            last_update_date=version.last_update_date,
-                            entity_type="version",
-                            entity_id=f"{project_id}:{version_no}"
-                        )
+                if version.last_update_date and not timestamps_equal(expected_last_update, version.last_update_date):
+                    raise RaceConditionError(
+                        f"Version '{version.no}' was modified by another user",
+                        current_user=username,
+                        last_update_user=version.last_update_user,
+                        last_update_date=version.last_update_date,
+                        entity_type="version",
+                        entity_id=f"{project_id}:{version_no}"
+                    )                
             
             # Update fields
             for key, value in update_data.items():
                 if hasattr(version, key) and key not in ['no', 'created_date', 'created_by', 'published', 'last_update_date']:
                     setattr(version, key, value)
             
-            version.last_update_date = datetime.utcnow().isoformat() + 'Z'
+            version.last_update_date = get_current_timestamp()
             version.last_update_user = username
             
             # Update project last update
-            project.last_update_date = datetime.utcnow().isoformat() + 'Z'
+            project.last_update_date = get_current_timestamp()
             project.last_update_user = username
             
             # Log activity
@@ -535,7 +522,7 @@ class ConfigProvider:
             
             # Create API
             api = APIConfig(
-                created_date=datetime.utcnow().isoformat() + 'Z',
+                created_date=get_current_timestamp(),
                 created_by=username,
                 **api_data
             )
@@ -575,27 +562,22 @@ class ConfigProvider:
             
             # Check race condition
             if expected_last_update is not None and expected_last_update != '':
-                if api.last_update_date:
-                    # Tarihleri normalize et
-                    expected_normalized = cls._normalize_date(expected_last_update)
-                    actual_normalized = cls._normalize_date(api.last_update_date)
-                    
-                    if expected_normalized != actual_normalized:
-                        raise RaceConditionError(
-                            f"API '{api.name}' was modified by another user",
-                            current_user=username,
-                            last_update_user=api.last_update_user,
-                            last_update_date=api.last_update_date,
-                            entity_type="api",
-                            entity_id=api.name
-                        )
+                if api.last_update_date and not timestamps_equal(expected_last_update, api.last_update_date):
+                    raise RaceConditionError(
+                        f"API '{api.name}' was modified by another user",
+                        current_user=username,
+                        last_update_user=api.last_update_user,
+                        last_update_date=api.last_update_date,
+                        entity_type="api",
+                        entity_id=api.name
+                    )                
                         
             # Update fields
             for key, value in update_data.items():
                 if hasattr(api, key) and key not in ['name', 'created_date', 'created_by', 'last_update_date']:
                     setattr(api, key, value)
             
-            api.last_update_date = datetime.utcnow().isoformat() + 'Z'
+            api.last_update_date = get_current_timestamp()
             api.last_update_user = username
             
             # Rebuild index
@@ -629,7 +611,7 @@ class ConfigProvider:
                 raise ResourceNotFoundError("api", api_name)
             
             api.deleted = True
-            api.last_update_date = datetime.utcnow().isoformat() + 'Z'
+            api.last_update_date = get_current_timestamp()
             api.last_update_user = username
             
             # Rebuild index
@@ -665,7 +647,7 @@ class ConfigProvider:
     ) -> None:
         """Add activity log entry"""
         activity = ActivityLogEntry(
-            timestamp=datetime.utcnow().isoformat() + 'Z',
+            timestamp=get_current_timestamp(),
             username=username,
             action=action,
             entity_type=entity_type,