Merge pull request #8 from acederberg/fix/uuids-only

Fix/uuids only

.github/workflows/pr_checks.yaml

@@ -63,6 +63,7 @@ jobs:
           echo "CAPTURA_CONFIG_CLIENT=$docker_config_path" >> .env
           echo "CAPTURA_CONFIG_APP_TEST=$docker_config_path" >> .env
           echo "CAPTURA_CONFIG_APP=$docker_config_path" >> .env
+          echo "CAPTURA_CONFIG_DUMMY=$docker_config_path" >> .env
           echo "CAPTURA_FLAKEY=/home/captura/flakey.yaml" >> .env
 
       - name: Start Docker Compose Project.
@@ -83,9 +84,12 @@ jobs:
           echo "MySQL Version: $version" >> $GITHUB_STEP_SUMMARY
           docker compose \
             --file docker/compose.ci.yaml \
+            --env-file .env \
             exec server \
             bash -c ' \
               source ~/app/.venv/bin/activate \
+              && echo $CAPTURA_CONFIG_DUMMY \
+              && echo $CAPTURA_CONFIG_APP_TEST \
               && poetry run simulatus initialize \
               && poetry run simulatus apply'
 
@@ -103,6 +107,7 @@ jobs:
         run: |
           docker compose \
             --file docker/compose.ci.yaml \
+            --env-file .env \
             exec server \
             bash -c ' \
               source ~/app/.venv/bin/activate \
@@ -123,6 +128,7 @@ jobs:
         run: |
           docker compose \
             --file docker/compose.ci.yaml \
+            --env-file .env \
             exec server \
             bash -c ' \
               source ~/app/.venv/bin/activate \
@@ -140,6 +146,7 @@ jobs:
         run: |
           docker compose \
             --file docker/compose.ci.yaml \
+            --env-file .env \
             cp server:/home/captura/app/coverage-report ./coverage-report
 
       - name: Upload Coverage Report.

src/captura/controllers/access.py

@@ -488,7 +488,7 @@ def check_one(collection: Collection) -> Collection:
 
             match self.method:
                 case H.GET if allow_public:
-                    if not collection.public and collection.id_user != token_user.id:
+                    if not collection.public and collection.uuid_user != token_user.uuid:
                         raise ErrAccessCollection.httpexception(
                             "_msg_private",
                             403,
@@ -497,7 +497,7 @@ def check_one(collection: Collection) -> Collection:
                         )
                     return collection
                 case H.GET | H.POST | H.DELETE | H.PUT | H.PATCH:
-                    if token_user.id != collection.id_user:
+                    if token_user.uuid != collection.uuid_user:
                         raise ErrAccessCollection.httpexception(
                             "_msg_modify",
                             403,

src/captura/controllers/create.py

@@ -332,14 +332,14 @@ def create_assignment(
         data: Data[ResolvedAssignmentDocument] | Data[ResolvedAssignmentCollection],
         target: Collection | Document,
     ) -> Assignment:
-        id_source_name = f"id_{data.data.kind_source.name}"
-        id_target_name = f"id_{data.data.kind_target.name}"
-        id_source_value = data.data.source.id  # type: ignore
+        uuid_source_name = f"uuid_{data.data.kind_source.name}"
+        uuid_target_name = f"uuid_{data.data.kind_target.name}"
+        uuid_source_value = data.data.source.uuid  # type: ignore
 
         kwargs = {
             "uuid": secrets.token_urlsafe(8),
-            id_source_name: id_source_value,
-            id_target_name: target.id,
+            uuid_source_name: uuid_source_value,
+            uuid_target_name: target.uuid,
         }
         return Assignment(
             **kwargs,
@@ -414,17 +414,17 @@ def create_grant(
             case bad:
                 raise ValueError(f"Invalid source `{bad}`.")
 
-        id_source_name = f"id_{data.data.kind_source.name}"
-        id_target_name = f"id_{data.data.kind_target.name}"
-        id_source_value = data.data.source.id  # type: ignore
+        uuid_source_name = f"uuid_{data.data.kind_source.name}"
+        uuid_target_name = f"uuid_{data.data.kind_target.name}"
+        uuid_source_value = data.data.source.uuid  # type: ignore
 
         kwargs = {
             "uuid": secrets.token_urlsafe(8),
             "uuid_parent": grant_parent_uuid,
             "pending_from": pending_from,
             "pending": True,
-            id_source_name: id_source_value,
-            id_target_name: target.id,
+            uuid_source_name: uuid_source_value,
+            uuid_target_name: target.uuid,
         }
         return Grant(**kwargs, **self.create_data.model_dump())
 
@@ -512,8 +512,8 @@ def document(
         data.data.token_user_grants = {
             user.uuid: (
                 Grant(
-                    id_user=user.id,
-                    id_document=document.id,
+                    uuid_user=user.uuid,
+                    uuid_document=document.uuid,
                     level=Level.own,
                     pending=False,
                     pending_from=PendingFrom.created,
@@ -748,7 +748,7 @@ def collection(self, data: Data[ResolvedCollection]) -> Data[ResolvedCollection]
             session,
             param.uuid_user,
         )
-        collection.id_user = user.id
+        collection.uuid_user = user.uuid
         data.event.children.append(
             Event(
                 **self.event_common,

src/captura/controllers/delete.py

@@ -239,8 +239,8 @@ def split_assocs(
                     model_assoc.uuid.in_(data.data.uuid_assoc),
                     and_(
                         model_target.uuid.in_(data.data.uuid_target),
-                        getattr(model_assoc, "id_" + data.data.kind_source.name)
-                        == data.data.source.id,
+                        getattr(model_assoc, "uuid_" + data.data.kind_source.name)
+                        == data.data.source.uuid,
                     ),
                 )
             )
@@ -474,7 +474,7 @@ def _collection(
             .join(Document)
             .where(
                 Document.uuid.in_(uuids(documents)),  # type: ignore[type-var]
-                Assignment.id_collection == collection.id,
+                Assignment.uuid_collection == collection.uuid,
             )
         )
         assignments = {
@@ -591,7 +591,7 @@ def _document(
                 select(Assignment)
                 .join(Collection)
                 .where(
-                    Assignment.id_document == document.id,
+                    Assignment.uuid_document == document.uuid,
                     Collection.uuid.in_(uuid_collections),
                 )
             )