main.py

@@ -30,9 +30,9 @@ async def root()->dict:
 def create_dirs():
     
     dirs_to_create=("./DB",
-                    "./upload",
-                    "./upload_bad",
-                    "./upload_finished")
+                    "./uploads/upload",
+                    "./uploads/upload_bad",
+                    "./uploads/upload_finished")
     
     for x in dirs_to_create:
         Path(x).mkdir(parents=True, exist_ok=True)

poetry.lock

@@ -98,7 +98,7 @@ version = "4.14.2"
 description = "High-level concurrency and networking framework on top of asyncio or Trio"
 optional = false
 python-versions = ">=3.10"
-groups = ["main"]
+groups = ["main", "dev"]
 files = [
     {file = "anyio-4.14.2-py3-none-any.whl", hash = "sha256:9f505dda5ac9f0c8309b5e8bd445a8c2bf7246f3ce950121e45ea15bc41d1494"},
     {file = "anyio-4.14.2.tar.gz", hash = "sha256:cfa139f3ed1a23ee8f88a145ddb5ac7605b8bbfd8592baacd7ce3d8bb4313c7f"},
@@ -703,12 +703,34 @@ version = "0.16.0"
 description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
 optional = false
 python-versions = ">=3.8"
-groups = ["main"]
+groups = ["main", "dev"]
 files = [
     {file = "h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86"},
     {file = "h11-0.16.0.tar.gz", hash = "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1"},
 ]
 
+[[package]]
+name = "httpcore"
+version = "1.0.9"
+description = "A minimal low-level HTTP client."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55"},
+    {file = "httpcore-1.0.9.tar.gz", hash = "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8"},
+]
+
+[package.dependencies]
+certifi = "*"
+h11 = ">=0.16"
+
+[package.extras]
+asyncio = ["anyio (>=4.0,<5.0)"]
+http2 = ["h2 (>=3,<5)"]
+socks = ["socksio (==1.*)"]
+trio = ["trio (>=0.22.0,<1.0)"]
+
 [[package]]
 name = "httpie"
 version = "3.2.4"
@@ -737,6 +759,32 @@ setuptools = "*"
 dev = ["Jinja2", "flake8", "flake8-comprehensions", "flake8-deprecated", "flake8-mutable", "flake8-tuple", "pyopenssl", "pytest", "pytest-cov", "pytest-httpbin (>=0.0.6)", "pytest-mock", "pyyaml", "responses", "twine", "werkzeug (<2.1.0)", "wheel"]
 test = ["pytest", "pytest-httpbin (>=0.0.6)", "pytest-mock", "responses", "werkzeug (<2.1.0)"]
 
+[[package]]
+name = "httpx"
+version = "0.28.1"
+description = "The next generation HTTP client."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad"},
+    {file = "httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc"},
+]
+
+[package.dependencies]
+anyio = "*"
+certifi = "*"
+httpcore = "==1.*"
+idna = "*"
+socksio = {version = "==1.*", optional = true, markers = "extra == \"socks\""}
+
+[package.extras]
+brotli = ["brotli ; platform_python_implementation == \"CPython\"", "brotlicffi ; platform_python_implementation != \"CPython\""]
+cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"]
+http2 = ["h2 (>=3,<5)"]
+socks = ["socksio (==1.*)"]
+zstd = ["zstandard (>=0.18.0)"]
+
 [[package]]
 name = "idna"
 version = "3.18"
@@ -1844,6 +1892,24 @@ urllib3 = ">=1.26,<3"
 socks = ["PySocks (>=1.5.6,!=1.5.7)"]
 use-chardet-on-py3 = ["chardet (>=3.0.2,<8)"]
 
+[[package]]
+name = "requests-async"
+version = "0.2.4"
+description = "Simple async HTTP client with requests-like interface, powered by httpx"
+optional = false
+python-versions = ">=3.7"
+groups = ["dev"]
+files = [
+    {file = "requests_async-0.2.4-py3-none-any.whl", hash = "sha256:a967efb84eb03a2053a847b1bfbac5917df8100d101368d883e20ae9ab15f7a2"},
+    {file = "requests_async-0.2.4.tar.gz", hash = "sha256:7eaa42cbfe4d0f1a5f1ef78625c625248cac5c5323afcbd76e7a2a26b85b56b9"},
+]
+
+[package.dependencies]
+httpx = {version = ">=0.23.0", extras = ["socks"]}
+
+[package.extras]
+dev = ["pytest (>=7.0.0)", "pytest-asyncio (>=0.21.0)", "pytest-cov (>=4.0.0)"]
+
 [[package]]
 name = "requests-toolbelt"
 version = "1.0.0"
@@ -1942,6 +2008,18 @@ files = [
     {file = "six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81"},
 ]
 
+[[package]]
+name = "socksio"
+version = "1.0.0"
+description = "Sans-I/O implementation of SOCKS4, SOCKS4A, and SOCKS5."
+optional = false
+python-versions = ">=3.6"
+groups = ["dev"]
+files = [
+    {file = "socksio-1.0.0-py3-none-any.whl", hash = "sha256:95dc1f15f9b34e8d7b16f06d74b8ccf48f609af32ab33c608d08761c5dcbb1f3"},
+    {file = "socksio-1.0.0.tar.gz", hash = "sha256:f88beb3da5b5c38b9890469de67d0cb0f9d494b78b106ca1845f96c10b91c4ac"},
+]
+
 [[package]]
 name = "sqlalchemy"
 version = "2.0.51"
@@ -2185,4 +2263,4 @@ files = [
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.13"
-content-hash = "6881b7672e5e0ed6a48d6416f117209ba1d0aefaf3b14db1ccec48360ebc22cb"
+content-hash = "e1edf156eafb0e85fb3c090f3f17595ef56216f6bb9a2881f553619a19d83f3f"

pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
     "python-jose (>=3.5.0,<4.0.0)",
     "python-multipart (>=0.0.32,<0.0.33)",
     "aiosqlite (>=0.22.1,<0.23.0)",
-    "greenlet (>=3.5.4,<4.0.0)"
+    "greenlet (>=3.5.4,<4.0.0)",
 ]
 
 [tool.poetry.group.dev.dependencies]
@@ -33,6 +33,7 @@ allure-pytest = ">=2.16.0,<3.0.0"
 ipython = ">=9.15.0,<10.0.0"
 httpie = ">=3.2.4,<4.0.0"
 pytest-asyncio = ">=1.4.0,<2.0.0"
+requests-async = ">=0.2.4,<0.3.0"
 
 [build-system]
 requires = ["poetry-core>=2.0.0,<3.0.0"]

src/database/users/crud.py

@@ -1,6 +1,6 @@
 from uuid import UUID
 
-from sqlalchemy import select, update
+from sqlalchemy import delete, select, update
 from sqlalchemy.ext.asyncio import async_sessionmaker
 
 from src.models.database_models.model import (
@@ -71,7 +71,7 @@ class UsersCrudActions:
             await session.flush()
             return UserOutDB.model_validate(new_user)
     
-    async def delete_user(self, user_email:str)->bool|None:
+    async def delete_user_soft(self, user_email:str)->bool|None:
         
         async with self.Session() as session, session.begin():
             
@@ -84,7 +84,20 @@ class UsersCrudActions:
             response.status=False
             return True
         
-    async def update_user(self, user_email:str, data:dict)->UserOutDB|None:
+        
+    async def delete_user_hard(self, user_email:str)->bool|None:
+        
+        async with self.Session() as session, session.begin():
+            
+            query=delete(User).where(User.email == user_email).returning(User)
+            response=(await session.scalars(query)).one_or_none()
+            
+            if response is None:
+                return None
+            
+            return True
+        
+    async def update_user_partially(self, user_email:str, data:dict)->UserOutDB|None:
         
         async with self.Session() as session, session.begin():
             

src/models/configs_read/env.py

@@ -12,4 +12,4 @@ class Env(Base):
     
     model_config=SettingsConfigDict(env_file="configs/.env", extra=None)
 
-env_settings=Env()
+env_settings=Env()  # type: ignore[call-arg]

src/models/pydantic_models/model.py

@@ -5,7 +5,7 @@ from uuid import UUID
 from pydantic import AfterValidator, BaseModel, EmailStr, Field
 
 
-def validate_password(password: str) -> str:
+async def validate_password(password: str) -> str:
     PUNCTUATION: set[str] = {"$", "@", "#", "%", "!", "^", "&", "*", "(", ")", "-", "_", "+", "=", "{", "}", "[", "]"}
     if len(password) < 8 or len(password) > 72:
         raise ValueError("Password must be 8-72 characters")

src/service/users_crud/users_crud.py

@@ -12,6 +12,14 @@ class CrudService:
         self.hash_service=HashService()
     
     
+    async def _plain_to_hash(self, user_data:dict)->dict:
+        
+        user_data["hashed_password"]=user_data.pop("plain_password")
+        user_data["hashed_password"]=self.hash_service.plain_to_hash(user_data["hashed_password"])
+        
+        return user_data
+    
+    
     async def get_user_by_email(self, email:str)->UserOut:
         
         user_entity=await self.crud_db_actions.get_user_by_email(email)
@@ -25,8 +33,7 @@ class CrudService:
         
         user_data=UserCreate.model_dump(data)
         
-        user_data["hashed_password"]=user_data.pop("plain_password")
-        user_data["hashed_password"]=self.hash_service.plain_to_hash(user_data["hashed_password"])
+        user_data=await self._plain_to_hash(user_data)
         
         user_entity=await self.crud_db_actions.create_user(user_data)
         
@@ -35,14 +42,21 @@ class CrudService:
         return UserOut.model_validate(user_entity)
     
     
-    async def delete_user(self, email:str)->bool:
+    async def delete_user_soft(self, email:str)->bool:
         
-        user_entity=await self.crud_db_actions.delete_user(email)
+        user_entity=await self.crud_db_actions.delete_user_soft(email)
         
         if not user_entity:
             raise self.errors.not_found_error(detail="User not found")
         return user_entity
     
+    async def delete_user_hard(self, email:str, current_user:UserOut)->bool:
+        
+        user_entity=await self.crud_db_actions.delete_user_hard(email)
+    
+        if not user_entity:
+            raise self.errors.not_found_error(detail="User not found")
+        return user_entity
     
     async def update_user(self, email:str, data:UserUpdate)->UserOut:
         
@@ -52,10 +66,9 @@ class CrudService:
             raise self.errors.bad_request_error(detail="User info to update can not be empty")
         
         if user_data.get("plain_password"):
-            user_data["hashed_password"]=user_data.pop("plain_password")
-            user_data["hashed_password"]=self.hash_service.plain_to_hash(user_data["hashed_password"])
+            user_data=await self._plain_to_hash(user_data)
         
-        user_entity=await self.crud_db_actions.update_user(email, user_data)
+        user_entity=await self.crud_db_actions.update_user_partially(email, user_data)
         
         if not user_entity:
             raise self.errors.not_found_error(detail="User not found")

src/web/protected_routes/protected_user_action_routes.py

@@ -14,9 +14,13 @@ async def get_current_user_by_email(email:str, crud:CrudService=Depends(crud_ser
 async def create_user(data:UserCreate, crud:CrudService=Depends(crud_service), current_user=Depends(get_current_user))->UserOut: #noqa: B008
     return await crud.create_user(data)
 
-@router.post("/delete_user")
-async def delete_user(email:str, crud:CrudService=Depends(crud_service), current_user=Depends(get_current_user))->bool: #noqa: B008
-    return await crud.delete_user(email)
+@router.post("/delete_user_soft")
+async def delete_user_soft(email:str, crud:CrudService=Depends(crud_service), current_user=Depends(get_current_user))->bool: #noqa: B008
+    return await crud.delete_user_soft(email)
+
+@router.post("/delete_user_hard")
+async def delete_user_hard(email:str, crud:CrudService=Depends(crud_service), current_user=Depends(get_current_user))->bool: #noqa: B008
+    return await crud.delete_user_hard(email, current_user)
 
 @router.post("/patch_user")
 async def patch_user(email:str, data:UserUpdate, crud:CrudService=Depends(crud_service), current_user=Depends(get_current_user))->UserOut: #noqa: B008

tests/e2e/conftest.py

@@ -0,0 +1,61 @@
+from uuid import uuid4
+
+import pytest_asyncio
+import requests_async
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class Env(BaseSettings):
+    HOST:str
+    PORT:str
+    TEST_USERNAME:str
+    TEST_PASSWORD:str
+    
+    model_config=SettingsConfigDict(env_file="configs/.e2e.env", extra=None)
+
+e2e_settings=Env() #  type: ignore[call-arg]
+
+class MySession(requests_async.AsyncSession):
+    def __init__(self):
+        super().__init__()
+        self.headers = {}
+        self.token = None
+
+    async def get(self, url:str, **kwargs):
+        if self.token:
+            self.headers['Authorization'] = f"Bearer {self.token}"
+        kwargs.setdefault('headers', self.headers)
+        return await super().get(url, **kwargs)
+
+@pytest_asyncio.fixture(scope="session", autouse=True)
+async def auth_fixture()->None:
+    
+    payload = {"username": e2e_settings.TEST_USERNAME, "password": e2e_settings.TEST_PASSWORD}
+    url = f'http://{e2e_settings.HOST}:{e2e_settings.PORT}'
+
+    async with MySession() as session:
+        response = await session.post(url + "/protected/token", data=payload)
+        response.raise_for_status()
+        session.token = response.json()["access_token"]
+
+@pytest_asyncio.fixture(scope="function", autouse=True)
+async def test_user_fixture():
+    
+    url=f"http://{e2e_settings.HOST}:{e2e_settings.PORT}"
+    test_id=uuid4
+    
+    new_user_record={
+        "first_name":f"TEST_{test_id}",
+        "last_name":f"TEST_{test_id}",
+        "middle_name":f"TEST_{test_id}",
+        "email":"TEST@TEST.TEST",
+        "plain_password":"1234",
+        "direct_permissions":[],
+        "group":[]
+    }
+    response=await requests_async.post(f"{url}/create_user", data=new_user_record)
+    print(response.json())
+    yield
+    new_user_to_delete={"email":"TEST@TEST.TEST"}
+    response=await requests_async.post(f"{url}/delete_user_hard", data=new_user_to_delete)
+    print(response.json())

tests/e2e/test_users_crud.py

@@ -0,0 +1,14 @@
+import allure
+import pytest
+
+
+@pytest.mark.integra
+class TestCrud:
+    
+    @pytest.mark.parametrize("email",[
+        ("Test_Email@test.com")
+    ])
+    async def test_get_user_by_email_positive(self):
+        
+        with allure.step(""):
+            pass