Renamed AuthUsers -> Users & completed user gql #181

example/api/src/main.py

@@ -1,17 +1,18 @@
 from starlette.responses import JSONResponse
 
 from api.src.queries.cities import CityGraphType, CityFilter, CitySort
-from api.src.queries.hello import UserGraphType#, AuthUserFilter, AuthUserSort, AuthUserGraphType
+from api.src.queries.hello import UserGraphType#, UserFilter, UserSort, UserGraphType
 from api.src.queries.user import UserFilter, UserSort
 from cpl.api.api_module import ApiModule
 from cpl.application.application_builder import ApplicationBuilder
-from cpl.auth.schema import AuthUser, Role
+from cpl.auth.schema import User, Role
 from cpl.core.configuration import Configuration
 from cpl.core.console import Console
 from cpl.core.environment import Environment
 from cpl.core.utils.cache import Cache
 from cpl.database.mysql.mysql_module import MySQLModule
 from cpl.graphql.application.graphql_app import GraphQLApp
+from cpl.graphql.auth.graphql_auth_module import GraphQLAuthModule
 from cpl.graphql.graphql_module import GraphQLModule
 from model.author_dao import AuthorDao
 from model.author_query import AuthorGraphType, AuthorFilter, AuthorSort
@@ -38,8 +39,9 @@ def main():
         .add_module(MySQLModule)
         .add_module(ApiModule)
         .add_module(GraphQLModule)
+        .add_module(GraphQLAuthModule)
         .add_scoped(ScopedService)
-        .add_cache(AuthUser)
+        .add_cache(User)
         .add_cache(Role)
         .add_transient(CityGraphType)
         .add_transient(CityFilter)
@@ -47,9 +49,9 @@ def main():
         .add_transient(UserGraphType)
         .add_transient(UserFilter)
         .add_transient(UserSort)
-        # .add_transient(AuthUserGraphType)
-        # .add_transient(AuthUserFilter)
-        # .add_transient(AuthUserSort)
+        # .add_transient(UserGraphType)
+        # .add_transient(UserFilter)
+        # .add_transient(UserSort)
         .add_transient(HelloQuery)
         # test data
         .add_singleton(TestDataSeeder)
@@ -100,7 +102,7 @@ def main():
     app.with_permissions(PostPermissions)
 
     provider = builder.service_provider
-    user_cache = provider.get_service(Cache[AuthUser])
+    user_cache = provider.get_service(Cache[User])
     role_cache = provider.get_service(Cache[Role])
 
     if role_cache == user_cache:

example/api/src/queries/hello.py

@@ -1,7 +1,7 @@
 from api.src.queries.cities import CityFilter, CitySort, CityGraphType, City
 from api.src.queries.user import User, UserFilter, UserSort, UserGraphType
 from cpl.api.middleware.request import get_request
-from cpl.auth.schema import AuthUserDao, AuthUser
+from cpl.auth.schema import UserDao, User
 from cpl.graphql.schema.filter.filter import Filter
 from cpl.graphql.schema.graph_type import GraphType
 from cpl.graphql.schema.query import Query
@@ -11,20 +11,20 @@ from cpl.graphql.schema.sort.sort_order import SortOrder
 users = [User(i, f"User {i}") for i in range(1, 101)]
 cities = [City(i, f"City {i}") for i in range(1, 101)]
 
-# class AuthUserFilter(Filter[AuthUser]):
+# class UserFilter(Filter[User]):
 #     def __init__(self):
 #         Filter.__init__(self)
 #         self.field("id", int)
 #         self.field("username", str)
 #
 #
-# class AuthUserSort(Sort[AuthUser]):
+# class UserSort(Sort[User]):
 #     def __init__(self):
 #         Sort.__init__(self)
 #         self.field("id", SortOrder)
 #         self.field("username", SortOrder)
 #
-# class AuthUserGraphType(GraphType[AuthUser]):
+# class UserGraphType(GraphType[User]):
 #
 #     def __init__(self):
 #         GraphType.__init__(self)
@@ -61,9 +61,9 @@ class HelloQuery(Query):
             resolver=lambda: cities,
         )
         # self.dao_collection_field(
-        #     AuthUserGraphType,
-        #     AuthUserDao,
-        #     "authUsers",
-        #     AuthUserFilter,
-        #     AuthUserSort,
+        #     UserGraphType,
+        #     UserDao,
+        #     "Users",
+        #     UserFilter,
+        #     UserSort,
         # )