PDCT-892/upgrade_to_new_db-client (#104)

* poetry lock

* refactor

* add new version of db-client

app/model/document.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import Optional
 
-from db_client.models.law_policy.family import DocumentStatus
+from db_client.models.dfce import DocumentStatus
 from pydantic import AnyHttpUrl, BaseModel
 
 

app/model/event.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import Optional
 
-from db_client.models.law_policy.family import EventStatus
+from db_client.models.dfce.family import EventStatus
 from pydantic import BaseModel
 
 

app/repository/app_user.py

@@ -1,6 +1,6 @@
 from typing import Optional, Tuple, cast
 
-from db_client.models.app.users import AppUser, Organisation, OrganisationUser
+from db_client.models.organisation import AppUser, Organisation, OrganisationUser
 from sqlalchemy.orm import Session
 
 MaybeAppUser = Optional[AppUser]

app/repository/collection.py

@@ -4,14 +4,11 @@
 from datetime import datetime
 from typing import Optional, Tuple, Union, cast
 
-from db_client.models.app.counters import CountedEntity
-from db_client.models.app.users import Organisation
-from db_client.models.law_policy import Collection
-from db_client.models.law_policy.collection import (
-    CollectionFamily,
-    CollectionOrganisation,
-)
-from db_client.models.law_policy.family import Family
+from db_client.models.dfce import Collection
+from db_client.models.dfce.collection import CollectionFamily, CollectionOrganisation
+from db_client.models.dfce.family import Family
+from db_client.models.organisation.counters import CountedEntity
+from db_client.models.organisation.users import Organisation
 from sqlalchemy import Column, and_
 from sqlalchemy import delete as db_delete
 from sqlalchemy import desc, or_

app/repository/config.py

@@ -1,17 +1,17 @@
 import logging
 from typing import Any, Optional
 
-from db_client.models.app.users import Organisation
 from db_client.models.base import AnyModel
-from db_client.models.document.physical_document import Language
-from db_client.models.law_policy.family import (
+from db_client.models.dfce.family import (
     FamilyDocumentRole,
     FamilyDocumentType,
     FamilyEventType,
     Variant,
 )
-from db_client.models.law_policy.geography import Geography
-from db_client.models.law_policy.metadata import MetadataOrganisation, MetadataTaxonomy
+from db_client.models.dfce.geography import Geography
+from db_client.models.dfce.metadata import MetadataOrganisation, MetadataTaxonomy
+from db_client.models.document.physical_document import Language
+from db_client.models.organisation.users import Organisation
 from sqlalchemy.orm import Session
 
 from app.model.config import ConfigReadDTO, DocumentConfig, EventConfig, TaxonomyData

app/repository/document.py

@@ -1,15 +1,15 @@
 import logging
 from typing import Optional, Tuple, Union, cast
 
-from db_client.models.app.counters import CountedEntity
+from db_client.models.dfce import FamilyDocument
+from db_client.models.dfce.family import DocumentStatus, Slug
 from db_client.models.document.physical_document import (
     Language,
     LanguageSource,
     PhysicalDocument,
     PhysicalDocumentLanguage,
 )
-from db_client.models.law_policy import FamilyDocument
-from db_client.models.law_policy.family import DocumentStatus, Slug
+from db_client.models.organisation.counters import CountedEntity
 from sqlalchemy import Column, and_
 from sqlalchemy import delete as db_delete
 from sqlalchemy import func

app/repository/event.py

@@ -4,8 +4,8 @@
 from datetime import datetime
 from typing import Optional, Tuple, Union, cast
 
-from db_client.models.app.counters import CountedEntity
-from db_client.models.law_policy import EventStatus, Family, FamilyDocument, FamilyEvent
+from db_client.models.dfce import EventStatus, Family, FamilyDocument, FamilyEvent
+from db_client.models.organisation.counters import CountedEntity
 from sqlalchemy import Column, and_
 from sqlalchemy import delete as db_delete
 from sqlalchemy import or_

app/repository/family.py

@@ -4,19 +4,19 @@
 from datetime import datetime
 from typing import Optional, Tuple, Union, cast
 
-from db_client.models.app.counters import CountedEntity
-from db_client.models.app.users import Organisation
-from db_client.models.law_policy.collection import CollectionFamily
-from db_client.models.law_policy.family import (
+from db_client.models.dfce.collection import CollectionFamily
+from db_client.models.dfce.family import (
     DocumentStatus,
     Family,
     FamilyDocument,
     FamilyOrganisation,
     FamilyStatus,
     Slug,
 )
-from db_client.models.law_policy.geography import Geography
-from db_client.models.law_policy.metadata import FamilyMetadata, MetadataOrganisation
+from db_client.models.dfce.geography import Geography
+from db_client.models.dfce.metadata import FamilyMetadata, MetadataOrganisation
+from db_client.models.organisation.counters import CountedEntity
+from db_client.models.organisation.users import Organisation
 from sqlalchemy import Column, and_
 from sqlalchemy import delete as db_delete
 from sqlalchemy import desc, or_

app/repository/geography.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from db_client.models.law_policy.geography import Geography
+from db_client.models.dfce.geography import Geography
 from sqlalchemy.orm import Session
 
 

app/repository/helpers.py

@@ -3,9 +3,9 @@
 from typing import Union, cast
 from uuid import uuid4
 
-from db_client.models.app.counters import CountedEntity, EntityCounter
-from db_client.models.app.users import Organisation
-from db_client.models.law_policy.family import Slug
+from db_client.models.dfce.family import Slug
+from db_client.models.organisation.counters import CountedEntity, EntityCounter
+from db_client.models.organisation.users import Organisation
 from slugify import slugify
 from sqlalchemy.orm import Session
 

app/repository/metadata.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from db_client.models.law_policy.metadata import MetadataOrganisation, MetadataTaxonomy
+from db_client.models.dfce.metadata import MetadataOrganisation, MetadataTaxonomy
 from sqlalchemy.orm import Session
 
 from app.model.general import Json

app/repository/organisation.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from db_client.models.app.users import Organisation
+from db_client.models.organisation.users import Organisation
 from sqlalchemy.orm import Session
 
 

app/service/authorisation.py

@@ -1,4 +1,4 @@
-from db_client.models.app.authorisation import (
+from db_client.models.organisation.authorisation import (
     AUTH_TABLE,
     HTTP_MAP_TO_OPERATION,
     AuthAccess,

app/service/category.py

@@ -1,4 +1,4 @@
-from db_client.models.law_policy.family import FamilyCategory
+from db_client.models.dfce.family import FamilyCategory
 
 from app.errors import ValidationError
 

integration_tests/collection/test_create.py

@@ -1,4 +1,4 @@
-from db_client.models.law_policy.collection import Collection
+from db_client.models.dfce.collection import Collection
 from fastapi import status
 from fastapi.testclient import TestClient
 from sqlalchemy.orm import Session

integration_tests/collection/test_delete.py

@@ -1,4 +1,4 @@
-from db_client.models.law_policy.collection import Collection
+from db_client.models.dfce.collection import Collection
 from fastapi import status
 from fastapi.testclient import TestClient
 from sqlalchemy.orm import Session

integration_tests/collection/test_update.py

@@ -1,4 +1,4 @@
-from db_client.models.law_policy.collection import (
+from db_client.models.dfce.collection import (
     Collection,
     CollectionFamily,
     CollectionOrganisation,

integration_tests/document/test_create.py

@@ -1,7 +1,7 @@
+from db_client.models.dfce import FamilyDocument
+from db_client.models.dfce.family import DocumentStatus, Slug
 from db_client.models.document import PhysicalDocument
 from db_client.models.document.physical_document import PhysicalDocumentLanguage
-from db_client.models.law_policy import FamilyDocument
-from db_client.models.law_policy.family import DocumentStatus, Slug
 from fastapi import status
 from fastapi.testclient import TestClient
 from sqlalchemy.orm import Session

integration_tests/document/test_delete.py

@@ -1,6 +1,6 @@
+from db_client.models.dfce import FamilyDocument
+from db_client.models.dfce.family import DocumentStatus
 from db_client.models.document import PhysicalDocument
-from db_client.models.law_policy import FamilyDocument
-from db_client.models.law_policy.family import DocumentStatus
 from fastapi import status
 from fastapi.testclient import TestClient
 from sqlalchemy.orm import Session

integration_tests/document/test_update.py

@@ -1,12 +1,12 @@
 from typing import Tuple, cast
 
+from db_client.models.dfce.family import FamilyDocument, Slug
 from db_client.models.document.physical_document import (
     Language,
     LanguageSource,
     PhysicalDocument,
     PhysicalDocumentLanguage,
 )
-from db_client.models.law_policy.family import FamilyDocument, Slug
 from fastapi import status
 from fastapi.testclient import TestClient
 from pydantic import AnyHttpUrl

integration_tests/event/test_create.py

@@ -1,4 +1,4 @@
-from db_client.models.law_policy import Family, FamilyEvent
+from db_client.models.dfce import Family, FamilyEvent
 from fastapi import status
 from fastapi.encoders import jsonable_encoder
 from fastapi.testclient import TestClient

integration_tests/event/test_delete.py

@@ -1,4 +1,4 @@
-from db_client.models.law_policy import FamilyEvent
+from db_client.models.dfce import FamilyEvent
 from fastapi import status
 from fastapi.testclient import TestClient
 from sqlalchemy.orm import Session

integration_tests/event/test_update.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timezone
 
-from db_client.models.law_policy import FamilyEvent
-from db_client.models.law_policy.family import EventStatus
+from db_client.models.dfce import FamilyEvent
+from db_client.models.dfce.family import EventStatus
 from fastapi import status
 from fastapi.encoders import jsonable_encoder
 from fastapi.testclient import TestClient

integration_tests/family/test_create.py

@@ -1,8 +1,8 @@
 from typing import Optional
 
-from db_client.models.law_policy.collection import CollectionFamily
-from db_client.models.law_policy.family import Family, Slug
-from db_client.models.law_policy.metadata import FamilyMetadata
+from db_client.models.dfce.collection import CollectionFamily
+from db_client.models.dfce.family import Family, Slug
+from db_client.models.dfce.metadata import FamilyMetadata
 from fastapi import status
 from fastapi.testclient import TestClient
 from sqlalchemy.orm import Session

integration_tests/family/test_delete.py

@@ -1,9 +1,4 @@
-from db_client.models.law_policy import (
-    DocumentStatus,
-    Family,
-    FamilyDocument,
-    FamilyStatus,
-)
+from db_client.models.dfce import DocumentStatus, Family, FamilyDocument, FamilyStatus
 from fastapi import status
 from fastapi.testclient import TestClient
 from sqlalchemy.orm import Session

integration_tests/family/test_update.py

@@ -1,8 +1,8 @@
 from typing import Optional
 
-from db_client.models.law_policy.collection import CollectionFamily
-from db_client.models.law_policy.family import Family, FamilyCategory, Slug
-from db_client.models.law_policy.metadata import FamilyMetadata
+from db_client.models.dfce.collection import CollectionFamily
+from db_client.models.dfce.family import Family, FamilyCategory, Slug
+from db_client.models.dfce.metadata import FamilyMetadata
 from fastapi import status
 from fastapi.testclient import TestClient
 from sqlalchemy.orm import Session

integration_tests/setup_db.py

@@ -1,29 +1,29 @@
 from typing import cast
 
-from db_client.models.app.users import AppUser, Organisation, OrganisationUser
-from db_client.models.document.physical_document import (
-    LanguageSource,
-    PhysicalDocument,
-    PhysicalDocumentLanguage,
-)
-from db_client.models.law_policy.collection import (
+from db_client.models.dfce.collection import (
     Collection,
     CollectionFamily,
     CollectionOrganisation,
 )
-from db_client.models.law_policy.family import (
+from db_client.models.dfce.family import (
     EventStatus,
     Family,
     FamilyDocument,
     FamilyEvent,
     FamilyOrganisation,
     Slug,
 )
-from db_client.models.law_policy.metadata import (
+from db_client.models.dfce.metadata import (
     FamilyMetadata,
     MetadataOrganisation,
     MetadataTaxonomy,
 )
+from db_client.models.document.physical_document import (
+    LanguageSource,
+    PhysicalDocument,
+    PhysicalDocumentLanguage,
+)
+from db_client.models.organisation.users import AppUser, Organisation, OrganisationUser
 from sqlalchemy import text
 from sqlalchemy.orm import Session