Union members upgrade fix.

print_service/models/__init__.py

@@ -23,8 +23,8 @@ class UnionMember(Model):
     union_number: Mapped[str] = mapped_column(String, nullable=True)
     student_number: Mapped[str] = mapped_column(String, nullable=True)
 
-    files: Mapped[list[File]] = relationship('File', back_populates='owner')
-    print_facts: Mapped[list[PrintFact]] = relationship('PrintFact', back_populates='owner')
+    files: Mapped[list[File]] = relationship('File', back_populates='owner', lazy="joined")
+    print_facts: Mapped[list[PrintFact]] = relationship('PrintFact', back_populates='owner', lazy="joined")
 
 
 class File(Model):

print_service/routes/user.py

@@ -122,20 +122,14 @@ def update_list(
             )
         db.session.flush()
         users_id.append(db_user.id)
-    db_delete_print_facts: list[PrintFact] = (
-        db.session.query(PrintFact).filter(PrintFact.owner_id.notin_(users_id)).all()
-    )
-    db_delete_files: list[File] = db.session.query(File).filter(File.owner_id.notin_(users_id)).all()
     db_delete_users: list[UnionMember] = (
         db.session.query(UnionMember).filter(UnionMember.id.notin_(users_id)).all()
     )
-    for print_fact in db_delete_print_facts:
-        db.session.delete(print_fact)
-    db.session.flush()
-    for file in db_delete_files:
-        db.session.delete(file)
-    db.session.flush()
     for _user in db_delete_users:
+        for print_fact in _user.print_facts:
+            db.session.delete(print_fact)
+        for files in _user.files:
+            db.session.delete(files)
         db.session.delete(_user)
     db.session.commit()
     return {"status": "ok", "count": len(input.users)}

tests/test_routes/test_user.py

@@ -112,3 +112,81 @@ def test_post_delete(client):
     assert res_post_delete.status_code == status.HTTP_200_OK
     res_get2 = client.get(url, params=params)
     assert res_get2.status_code == status.HTTP_404_NOT_FOUND
+    body = {
+        'users': [
+            {
+                'username': 'paul',
+                'union_number': '1966',
+                'student_number': '1967',
+            },
+            {
+                'username': 'semen',
+                'union_number': '1888',
+                'student_number': '1887',
+            },
+            {
+                'username': 'artem',
+                'union_number': '1777',
+                'student_number': '1776',
+            }
+        ],
+    }
+    res_post = client.post(url, json=body)
+    assert res_post.status_code == status.HTTP_200_OK
+    params = {
+        'surname': 'semen',
+        'number': '1888',
+    }
+    res_get = client.get(url, params=params)
+    assert res_get.status_code == status.HTTP_202_ACCEPTED
+    params = {
+        'surname': 'artem',
+        'number': '1777',
+    }
+    res_get = client.get(url, params=params)
+    assert res_get.status_code == status.HTTP_202_ACCEPTED
+    body = {
+        'users': [
+            {
+                'username': 'semen',
+                'union_number': '1889',
+                'student_number': '1887',
+            },
+            {
+                'username': 'artem',
+                'union_number': '1777',
+                'student_number': '1776',
+            },
+            {
+                'username': 'roman',
+                'union_number': '1999',
+                'student_number': '1998',
+            },
+        ],
+    }
+    res_post_multi = client.post(url, json=body)
+    assert res_post_multi.status_code == status.HTTP_200_OK
+    params = {
+        'surname': 'semen',
+        'number': '1888',
+    }
+    res_get = client.get(url, params=params)
+    assert res_get.status_code == status.HTTP_404_NOT_FOUND
+    params = {
+        'surname': 'semen',
+        'number': '1889',
+    }
+    res_get = client.get(url, params=params)
+    assert res_get.status_code == status.HTTP_202_ACCEPTED
+    params = {
+        'surname': 'artem',
+        'number': '1777',
+    }
+    res_get = client.get(url, params=params)
+    assert res_get.status_code == status.HTTP_202_ACCEPTED
+    params = {
+        'surname': 'roman',
+        'number': '1999',
+    }
+    res_get = client.get(url, params=params)
+    assert res_get.status_code == status.HTTP_202_ACCEPTED