Skip to content

Restyle #373 - Add extra parameters to Decorators #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2022
Merged

Restyle #373 - Add extra parameters to Decorators #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/core/minos-microservice-networks/minos/networks/discovery/connectors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ def _endpoints_from_config(config: Config) -> list[dict[str, Any]]:
for name in config.get_services():
decorators = EnrouteCollector(name, config).get_rest_command_query()
endpoints += [
{"url": decorator.url, "method": decorator.method} | decorator.kwargs for decorator in
set(chain(*decorators.values()))
{"url": decorator.url, "method": decorator.method} | decorator.kwargs
for decorator in set(chain(*decorators.values()))
]

endpoints.sort(key=itemgetter("url", "method"))
Expand Down
49 changes: 41 additions & 8 deletions packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,54 @@ def test_rest_command(self):
self.assertEqual(RestCommandEnrouteDecorator("tickets/", "GET"), decorator)

def test_rest_command_kwargs(self):
decorator = enroute.rest.command(path="tickets/", method="GET", authorized=True,
allowed_groups=['super_admin', 'admin', ])
decorator = enroute.rest.command(
path="tickets/",
method="GET",
authorized=True,
allowed_groups=[
"super_admin",
"admin",
],
)
self.assertEqual(
RestCommandEnrouteDecorator("tickets/", "GET", authorized=True, allowed_groups=['super_admin', 'admin', ]),
decorator)
RestCommandEnrouteDecorator(
"tickets/",
"GET",
authorized=True,
allowed_groups=[
"super_admin",
"admin",
],
),
decorator,
)

def test_rest_query(self):
decorator = enroute.rest.query(path="tickets/", method="GET")
self.assertEqual(RestQueryEnrouteDecorator("tickets/", "GET"), decorator)

def test_rest_query_kwargs(self):
decorator = enroute.rest.query(path="tickets/", method="GET", authorized=True,
allowed_groups=['super_admin', 'admin', ])
self.assertEqual(RestQueryEnrouteDecorator("tickets/", "GET", authorized=True,
allowed_groups=['super_admin', 'admin', ]), decorator)
decorator = enroute.rest.query(
path="tickets/",
method="GET",
authorized=True,
allowed_groups=[
"super_admin",
"admin",
],
)
self.assertEqual(
RestQueryEnrouteDecorator(
"tickets/",
"GET",
authorized=True,
allowed_groups=[
"super_admin",
"admin",
],
),
decorator,
)

def test_rest_event_raises(self):
with self.assertRaises(AttributeError):
Expand Down
16 changes: 13 additions & 3 deletions ...s/core/minos-microservice-networks/tests/test_networks/test_decorators/test_collectors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
)
from tests.utils import (
FakeService,
FakeServiceWithGetEnroute, FakeServiceWithKwargs,
FakeServiceWithGetEnroute,
FakeServiceWithKwargs,
)


Expand Down Expand Up @@ -62,8 +63,17 @@ def test_get_rest_command_query_kwargs(self):

observed = analyzer.get_rest_command_query()
expected = {
"get_tickets": {RestQueryEnrouteDecorator("tickets/", "GET", authorized=True,
allowed_groups=['super_admin', 'admin', ])},
"get_tickets": {
RestQueryEnrouteDecorator(
"tickets/",
"GET",
authorized=True,
allowed_groups=[
"super_admin",
"admin",
],
)
},
}

self.assertEqual(expected, observed)
Expand Down
11 changes: 10 additions & 1 deletion packages/core/minos-microservice-networks/tests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,21 @@ def bar(self, request: Request):
class FakeServiceWithKwargs:
"""For testing purposes."""

@enroute.rest.query(path="tickets/", method="GET", authorized=True, allowed_groups=['super_admin', 'admin', ])
@enroute.rest.query(
path="tickets/",
method="GET",
authorized=True,
allowed_groups=[
"super_admin",
"admin",
],
)
@enroute.broker.query(topic="GetTickets")
async def get_tickets(self, request: Request) -> Response:
"""For testing purposes."""
return Response(": ".join(("Get Tickets", await request.content())))


class FakeServiceWithGetEnroute:
"""For testing purposes."""

Expand Down
13 changes: 10 additions & 3 deletions packages/plugins/minos-router-graphql/tests/test_graphql/test_decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,16 @@ def test_get_all_queries_with_kwargs(self):

expected = {
"get_order": {
GraphQlQueryEnrouteDecorator(name="order", argument=GraphQLField(GraphQLString), output=GraphQLString,
authorized=True,
allowed_groups=['super_admin', 'admin', ])
GraphQlQueryEnrouteDecorator(
name="order",
argument=GraphQLField(GraphQLString),
output=GraphQLString,
authorized=True,
allowed_groups=[
"super_admin",
"admin",
],
)
},
}

Expand Down
12 changes: 10 additions & 2 deletions packages/plugins/minos-router-graphql/tests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,16 @@ class FakeQueryService2:
"""For testng purposes."""

# noinspection PyUnusedLocal
@enroute.graphql.query(name="order", argument=GraphQLField(GraphQLString), output=GraphQLString, authorized=True,
allowed_groups=['supèr_admin', 'admin', ])
@enroute.graphql.query(
name="order",
argument=GraphQLField(GraphQLString),
output=GraphQLString,
authorized=True,
allowed_groups=[
"supèr_admin",
"admin",
],
)
def get_order(self, request: Request):
"""For testng purposes."""

Expand Down