ADD: rate of unit test coverage generation in CI

Author: luis

Diff for: .circleci/config.yml

@@ -1,4 +1,4 @@
-version: 2
+version: 2.1
 jobs:
   build:
 
@@ -25,4 +25,5 @@ jobs:
       - run: sudo pip install setuptools-rust
       - run: sudo python -m pip install --upgrade pip
       - run: sudo pip install --trusted-host=pypi.python.org --trusted-host=pypi.org --trusted-host=files.pythonhosted.org -r requirements.txt
-      - run: python -m pytest ./tests/test_implementations
+      - run: coverage run -m pytest ./tests/test_implementations
+      - run: coveralls

Diff for: .coveragerc

@@ -0,0 +1,11 @@
+
+[report]
+show_missing = True
+omit =
+    venv/*
+    tests/*
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    raise NotImplementedError
+    self._exclude_column = \[\]
+    if __name__ == .__main__.:

Diff for: .gitignore

@@ -0,0 +1,2 @@
+/htmlcov/
+.coverage

Diff for: README.md

@@ -1,7 +1,14 @@
 #  FastAPI Quick CRUD
 
+
+
+
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/c2a6306f7f0a41948369d80368eb7abb)](https://www.codacy.com/gh/LuisLuii/FastAPIQuickCRUD/dashboard?utm_source=github.com&utm_medium=referral&utm_content=LuisLuii/FastAPIQuickCRUD&utm_campaign=Badge_Grade)
-[![CircleCI](https://circleci.com/gh/LuisLuii/FastAPIQuickCRUD/tree/develop.svg?style=svg)](https://circleci.com/gh/LuisLuii/FastAPIQuickCRUD/tree/main)
+[![Coverage Status](https://coveralls.io/repos/github/LuisLuii/FastAPIQuickCRUD/badge.svg?branch=feature/code_coverage)](https://coveralls.io/github/LuisLuii/FastAPIQuickCRUD?branch=develop)
+[![CircleCI](https://circleci.com/gh/LuisLuii/FastAPIQuickCRUD/tree/develop.svg?style=svg)](https://circleci.com/gh/LuisLuii/FastAPIQuickCRUD/tree/develop)
+[![PyPidownload](https://img.shields.io/pypi/dm/fastapi-quickcrud)](https://pypi.org/project/fastapi-quickcrud)
+[![SupportedVersion](https://img.shields.io/pypi/pyversions/fastapi-quickcrud)](https://pypi.org/project/fastapi-quickcrud)
+[![SupportedVersion](https://img.shields.io/pypi/status/fastapi-quickcrud)](https://pypi.org/project/fastapi-quickcrud)
 
 ---
 

Diff for: README_zh.md

@@ -1,7 +1,12 @@
 #  FastAPI Quick CRUD
 
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/c2a6306f7f0a41948369d80368eb7abb)](https://www.codacy.com/gh/LuisLuii/FastAPIQuickCRUD/dashboard?utm_source=github.com&utm_medium=referral&utm_content=LuisLuii/FastAPIQuickCRUD&utm_campaign=Badge_Grade)
 
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/c2a6306f7f0a41948369d80368eb7abb)](https://www.codacy.com/gh/LuisLuii/FastAPIQuickCRUD/dashboard?utm_source=github.com&utm_medium=referral&utm_content=LuisLuii/FastAPIQuickCRUD&utm_campaign=Badge_Grade)
+[![Coverage Status](https://coveralls.io/repos/github/LuisLuii/FastAPIQuickCRUD/badge.svg?branch=feature/code_coverage)](https://coveralls.io/github/LuisLuii/FastAPIQuickCRUD?branch=develop)
+[![CircleCI](https://circleci.com/gh/LuisLuii/FastAPIQuickCRUD/tree/develop.svg?style=svg)](https://circleci.com/gh/LuisLuii/FastAPIQuickCRUD/tree/develop)
+[![PyPidownload](https://img.shields.io/pypi/dm/fastapi-quickcrud)](https://pypi.org/project/fastapi-quickcrud)
+[![SupportedVersion](https://img.shields.io/pypi/pyversions/fastapi-quickcrud)](https://pypi.org/project/fastapi-quickcrud)
+[![SupportedVersion](https://img.shields.io/pypi/status/fastapi-quickcrud)](https://pypi.org/project/fastapi-quickcrud)
 
 FastAPI Quick CRUD 可以為你節省編寫重複的CRUD代碼，用戶只需要為你的Postgresql table編寫Sqlalchemy Declarative Base Class 便可立即生成該Table的 CRUD API。
 

Diff for: __main__.py

@@ -7,4 +7,6 @@ StrEnum
 pytest
 guid
 uvicorn
-requests
+requests
+coverage
+coveralls

Diff for: requirements.txt

@@ -26,7 +26,7 @@
         author_email='[email protected]',
         url='https://gitlab.com/luislui/quickcrud',
         license="MIT License",
-        keywords=["fastapi", "crud", "restful", "routing", "generator", "crudrouter","postgresql","builder"],
+        keywords=["fastapi", "crud", "restful", "routing","SQLAlchemy", "generator", "crudrouter","postgresql","builder"],
         packages=find_packages('src'),
         package_dir={'': 'src'},
         setup_requires=["setuptools>=31.6.0"],

Diff for: setup.py

@@ -12,7 +12,7 @@
 from .misc.abstract_execute import SQLALchemyExecuteService, DatabasesExecuteService
 from .misc.abstract_parser import SQLALchemyResultParse, DatabasesResultParserBase
 from .misc.abstract_query import SQLALchemyQueryService
-from .misc.abstract_route import SQLALChemyBaseRouteSource
+from .misc.abstract_route import SQLALChemyBaseRouteSource, DatabasesRouteResourceBase
 from .misc.crud_model import CRUDModel
 from .misc.type import CrudMethods, SessionObject
 
@@ -61,14 +61,15 @@ def crud_router_builder(
         execute_service = SQLALchemyExecuteService()
         crud_service = SQLALchemyQueryService(model=db_model, async_mode=async_mode)
     else:
-        routes_source = SQLALChemyBaseRouteSource
-        if not async_mode:
-            raise Exception('databases session object only support async')
-        result_parser = DatabasesResultParserBase(async_model=async_mode,
-                                                  crud_models=crud_models,
-                                                  autocommit=autocommit)
-        execute_service = DatabasesExecuteService()
-        crud_service = SQLALchemyQueryService(model=db_model, async_mode=async_mode)
+        raise NotImplementedError
+        # routes_source = DatabasesRouteResourceBase
+        # if not async_mode:
+        #     raise Exception('databases session object only support async')
+        # result_parser = DatabasesResultParserBase(async_model=async_mode,
+        #                                           crud_models=crud_models,
+        #                                           autocommit=autocommit)
+        # execute_service = DatabasesExecuteService()
+        # crud_service = SQLALchemyQueryService(model=db_model, async_mode=async_mode)
 
     def find_one_api(request_response_model: dict, dependencies):
         _request_query_model = request_response_model.get('requestQueryModel', None)

Diff for: src/fastapi_quickcrud/crud_router.py

@@ -1,14 +1,4 @@
 from abc import ABC, abstractmethod
-from typing import List
-
-from sqlalchemy import and_, text, select, delete, update
-from sqlalchemy.dialects.postgresql import insert
-from sqlalchemy.sql.elements import BinaryExpression
-
-from .exceptions import UnknownOrderType, UpdateColumnEmptyException, UnknownColumn
-from .type import Ordering
-from .utils import alias_to_column
-from .utils import find_query_builder
 
 
 class DBExecuteServiceBase(ABC):
@@ -21,12 +11,13 @@ async def async_execute(self):
     def execute(self):
         raise NotImplementedError
 
+
 class SQLALchemyExecuteService(DBExecuteServiceBase):
 
     def __init__(self):
         pass
 
-    async def async_execute_and_expire(self,session, stmt):
+    async def async_execute_and_expire(self, session, stmt):
         result = await session.execute(stmt)
         session.expire_all()
         return result
@@ -36,35 +27,25 @@ def execute_and_expire(self, session, stmt):
         session.expire_all()
         return result
 
-    async def async_execute(self,session, stmt):
+    async def async_execute(self, session, stmt):
         return await session.execute(stmt)
 
-    def execute(self,session, stmt):
+    def execute(self, session, stmt):
         return session.execute(stmt)
 
 
-class DatabasesExecuteService(DBExecuteServiceBase):
-
+class DatabasesExecuteService():
     def __init__(self):
-        pass
-
-    def insert_one(self):
-        raise NotImplementedError
-
-    def get_many(self):
-        raise NotImplementedError
-    def get_one(self):
-        raise NotImplementedError
-
-    async def async_get_one(self, session, stmt):
-        query_result = await session.fetch_one(stmt)
-        return query_result
-
-    def upsert(self):
-        raise NotImplementedError
-
-    def delete(self):
         raise NotImplementedError
 
-    def update(self):
-        raise NotImplementedError
+    # async def async_fetch_many(self, session, stmt):
+    #     return await session.fetch_all(query=stmt)
+    #
+    # async def async_fetch_one(self, session, stmt,value):
+    #     return await session.fetch_one(query=stmt, values=value)
+    #
+    # async def async_execute(self, session, stmt):
+    #     return await session.execute(query=stmt)
+    #
+    # async def async_execute_many(self, session, stmt):
+    #     return await session.execute_many(query=stmt)

Diff for: src/fastapi_quickcrud/misc/abstract_execute.py

@@ -102,6 +102,7 @@ def find_one(self, *, response_model, sql_execute_result, fastapi_response, **kw
         return result
 
     async def async_find_many(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
+        # FIXME handle NO_CONTENT
         result_list = [i.__dict__ for i in sql_execute_result.scalars()]
         result = parse_obj_as(response_model, result_list)
         fastapi_response.headers["x-total-count"] = str(len(result_list))
@@ -340,62 +341,68 @@ def post_redirect_get(self, *, response_model, sql_execute_result, fastapi_reque
 
 
 class DatabasesResultParserBase(ABC):
-
-    def __init__(self, async_model, crud_models, autocommit):
-        self.async_mode = async_model
-        self.crud_models = crud_models
-        self.primary_name = crud_models.PRIMARY_KEY_NAME
-        self.autocommit = autocommit
-
-    async def async_commit(self, session):
-        if self.autocommit:
-            await session.commit()
-
-    async def async_find_one(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
-        if not sql_execute_result:
-            return Response('specific data not found',status_code=HTTPStatus.NOT_FOUND)
-        result = parse_obj_as(response_model, dict(sql_execute_result))
-        fastapi_response.headers["x-total-count"] = str(1)
-
-        await self.async_commit(kwargs.get('session'))
-        return result
-
-    def find_many(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
-        raise NotImplementedError
-
-
-    def update_one(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
-        raise NotImplementedError
-
-
-    def update_many(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
-        raise NotImplementedError
-
-
-    def patch_one(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
-        raise NotImplementedError
-
-
-    def patch_many(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
-        raise NotImplementedError
-
-
-    def upsert_one(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
-        raise NotImplementedError
-
-
-    def upsert_many(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
-        raise NotImplementedError
-
-
-    def delete_one(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
-        raise NotImplementedError
-
-
-    def delete_many(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
-        raise NotImplementedError
-
-
-    def post_redirect_get(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
+    def __init__(self):
         raise NotImplementedError
 
+    # def __init__(self, async_model, crud_models, autocommit):
+    #     self.async_mode = async_model
+    #     self.crud_models = crud_models
+    #     self.primary_name = crud_models.PRIMARY_KEY_NAME
+    #     self.autocommit = autocommit
+    #
+    # async def async_commit(self, session):
+    #     if self.autocommit:
+    #         await session.commit()
+    #
+    # async def async_find_one(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
+    #     if not sql_execute_result:
+    #         return Response('specific data not found',status_code=HTTPStatus.NOT_FOUND)
+    #     result = parse_obj_as(response_model, dict(sql_execute_result))
+    #     fastapi_response.headers["x-total-count"] = str(1)
+    #
+    #     await self.async_commit(kwargs.get('session'))
+    #     return result
+    #
+    # async def async_find_many(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
+    #     # sql_execute_result = [] if no data
+    #     result_list = [dict(i) for i in sql_execute_result]
+    #     result = parse_obj_as(response_model, result_list)
+    #     fastapi_response.headers["x-total-count"] = str(len(result_list))
+    #     await self.async_commit(kwargs.get('session'))
+    #     return result
+    #
+    # def update_one(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
+    #     raise NotImplementedError
+    #
+    #
+    # def update_many(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
+    #     raise NotImplementedError
+    #
+    #
+    # def patch_one(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
+    #     raise NotImplementedError
+    #
+    #
+    # def patch_many(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
+    #     raise NotImplementedError
+    #
+    #
+    # def upsert_one(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
+    #     raise NotImplementedError
+    #
+    #
+    # def upsert_many(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
+    #     raise NotImplementedError
+    #
+    #
+    # def delete_one(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
+    #     raise NotImplementedError
+    #
+    #
+    # def delete_many(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
+    #     raise NotImplementedError
+    #
+    #
+    # def post_redirect_get(self, *, response_model, sql_execute_result, fastapi_response, **kwargs):
+    #     raise NotImplementedError
+    #