From b883802eac50e7ea9d22e9b15f0761d18e193896 Mon Sep 17 00:00:00 2001 From: Augusto Gunsch Date: Tue, 19 Oct 2021 01:06:08 -0300 Subject: [PATCH] Reorganizar arquivos --- api/routes/routes.py | 3 ++- api/util/__init__.py | 0 api/{views => util}/authentication.py | 2 +- api/{views => util}/fetch.py | 0 api/{views => util}/parse_args.py | 0 api/views/pokemon_owned.py | 4 ++-- api/views/trainer.py | 2 +- 7 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 api/util/__init__.py rename api/{views => util}/authentication.py (94%) rename api/{views => util}/fetch.py (100%) rename api/{views => util}/parse_args.py (100%) diff --git a/api/routes/routes.py b/api/routes/routes.py index 70fc7c2..850ffb3 100644 --- a/api/routes/routes.py +++ b/api/routes/routes.py @@ -1,5 +1,6 @@ from api.app import app -from api.views import trainer, pokemon_owned, authentication, errors +from api.views import trainer, pokemon_owned, errors +from api.util import authentication import asyncio @app.route("/trainer/", methods=["GET"]) diff --git a/api/util/__init__.py b/api/util/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/api/views/authentication.py b/api/util/authentication.py similarity index 94% rename from api/views/authentication.py rename to api/util/authentication.py index 34535a3..85c5086 100644 --- a/api/views/authentication.py +++ b/api/util/authentication.py @@ -2,7 +2,7 @@ from functools import wraps from flask import request from api.app import app from .fetch import get_trainer_by_nick_fail, NotFound -from .errors import AuthenticationFailure +from api.views.errors import AuthenticationFailure import jwt # autenticaĆ§Ć£o do trainer (decorator) diff --git a/api/views/fetch.py b/api/util/fetch.py similarity index 100% rename from api/views/fetch.py rename to api/util/fetch.py diff --git a/api/views/parse_args.py b/api/util/parse_args.py similarity index 100% rename from api/views/parse_args.py rename to api/util/parse_args.py diff --git a/api/views/pokemon_owned.py b/api/views/pokemon_owned.py index 32a0b78..553b3a1 100644 --- a/api/views/pokemon_owned.py +++ b/api/views/pokemon_owned.py @@ -1,8 +1,8 @@ from api.models.pokemon_owned import pokemon_owned_schema, pokemon_owned_schemas, PokemonOwned from api.app import db -from .parse_args import parse_limit, parse_offset, ParsingException, parse_json_obj +from api.util.fetch import * +from api.util.parse_args import parse_limit, parse_offset, ParsingException, parse_json_obj from .errors import ParsingError, FetchError, ConflictingResources -from .fetch import * from aiohttp import ClientSession import asyncio from sqlalchemy.exc import IntegrityError diff --git a/api/views/trainer.py b/api/views/trainer.py index 376c9a7..bce373d 100644 --- a/api/views/trainer.py +++ b/api/views/trainer.py @@ -4,7 +4,7 @@ from api.app import db from api.app import app from flask import request, jsonify from .errors import * -from .parse_args import parse_limit, parse_offset, ParsingException, parse_json_obj +from api.util.parse_args import parse_limit, parse_offset, ParsingException, parse_json_obj from werkzeug.security import check_password_hash import datetime import jwt