Skip to content

Commit

Permalink
remove ununsed import
Browse files Browse the repository at this point in the history
  • Loading branch information
kimbugp committed Jan 21, 2020
1 parent 991887d commit 37e914f
Show file tree
Hide file tree
Showing 23 changed files with 25 additions and 45 deletions.
3 changes: 3 additions & 0 deletions apps/cinema/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
from main import api


__all__ = (api,)
2 changes: 1 addition & 1 deletion apps/cinema/schema/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .schema_utils import validate_date
from .schema_utils import validate_date # noqa


from webargs import fields as flds
Expand Down
5 changes: 2 additions & 3 deletions apps/cinema/schema/schema_utils.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
from datetime import datetime

import jsonschema

from apps.middlewares.validation import ValidationError


def validate_date(obj):
try:
date = datetime.strptime(obj, "%Y-%m-%d")
except Exception as error:
datetime.strptime(obj, "%Y-%m-%d")
except Exception:
raise ValidationError(
"error", payload={"message": "use datetime format YYYY-MM-DD"}
)
Expand Down
3 changes: 0 additions & 3 deletions apps/cinema/schema/ticket_schema.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import re

from flask_restplus import fields

from apps.cinema import api
from apps.middlewares.validation import ValidationError

from .seats_schema import seats_schema

ticket_schema = api.model(
"Ticket",
Expand Down
2 changes: 0 additions & 2 deletions apps/cinema/schema/user_schema.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import re

from apps.cinema import api
from apps.middlewares.validation import ValidationError
from flask_restplus import fields

user_schema_fields = api.model(
Expand Down
12 changes: 6 additions & 6 deletions apps/cinema/views/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .auth import *
from .errors import *
from .showtimes import *
from .tickets import *
from .cinemahall import *
from .movies import *
from .auth import * # noqa
from .errors import * # noqa
from .showtimes import * # noqa
from .tickets import * # noqa
from .cinemahall import * # noqa
from .movies import * # noqa
2 changes: 1 addition & 1 deletion apps/cinema/views/auth.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from flask import Blueprint, jsonify, request
from flask import request
from flask_restplus import Resource
from webargs import fields as flds
from werkzeug.security import check_password_hash, generate_password_hash
Expand Down
9 changes: 4 additions & 5 deletions apps/cinema/views/cinemahall.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
from flask import current_app, request
from flask import current_app

from apps.cinema import api
from apps.cinema.schema import param, validate_date
from apps.cinema.schema.cinema_schema import *
from apps.cinema.schema import param
from apps.cinema.schema.cinema_schema import cinema_response_schema, process_seats, schema
from apps.cinema.schema.parser import use_args
from apps.middlewares.auth import is_admin, token_header
from controllers.cinema import CinemaController
from controllers.seats import SeatController
from flask_restplus import Resource
from models import CinemaHall
from utils import dict_to_tuple, find_or_404
from utils import find_or_404
from webargs import fields as flds

cinema_args = {"id": param(flds.Int(required=True))}
Expand Down Expand Up @@ -55,7 +55,6 @@ def put(self, cinema_id):
schema["required"] = ["seats"]
api.schema_model("cinema", {**schema}).validate(body)
seats = body.pop("seats")
controller = CinemaController()
cinema = find_or_404(current_app.db, CinemaHall, id=cinema_id)
seats_dict = SeatController().insert(process_seats(seats, cinema.id))
return {"seats": seats_dict, **cinema._asdict()}, 200
1 change: 0 additions & 1 deletion apps/cinema/views/errors.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from flask import jsonify, make_response
from apps.cinema import api
from apps.middlewares.validation import ValidationError
from apps.cinema.schema.parser import parser
Expand Down
4 changes: 1 addition & 3 deletions apps/cinema/views/movies.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import datetime

from flask import jsonify, request

from apps.cinema import api
from apps.cinema.schema.movie_schema import movie_response_schema, schema
from apps.middlewares.auth import is_admin, token_header
from controllers.movies_controller import MovieController
from flask_restplus import Model, Resource, fields, marshal_with
from flask_restplus import Resource


@api.route("/movie", endpoint="movies")
Expand Down
1 change: 0 additions & 1 deletion controllers/cinema.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import os

from models import CinemaHall

Expand Down
1 change: 0 additions & 1 deletion controllers/movies_controller.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import os

from models import Movie

Expand Down
3 changes: 0 additions & 3 deletions controllers/sql_controllers.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
from collections import namedtuple

from flask import current_app

from apps.middlewares.validation import ValidationError
from sql import get_cte_query
from utils import dict_to_tuple, find_or_404


Expand Down
4 changes: 2 additions & 2 deletions controllers/ticket_controller.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from apps.middlewares.validation import ValidationError
from models import Seat, ShowTime, Ticket
from models import Seat, ShowTime, Ticket # noqa
from sql import get_cte_query
from utils import find_or_404

Expand All @@ -10,7 +10,7 @@ class TicketController(SQLBaseController):
table = Ticket

def insert(self, seats, showtime_id, seat_id, **kwargs):
showtime = self.validate_showtime(showtime_id)
self.validate_showtime(showtime_id)
self.validate_seat(set(seat_id), showtime_id)
return super().insert(seats)

Expand Down
3 changes: 1 addition & 2 deletions controllers/user_controller.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from flask import current_app

from models import Ticket, Users
from models import Ticket, Users # noqa

from .sql_controllers import SQLBaseController

Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from flask import jsonify, make_response, current_app
from flask import jsonify, make_response
import pytest
from main import create_app
from utils import NotFound, seed_data
Expand Down
1 change: 0 additions & 1 deletion tests/test_cinema.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import json

import psycopg2

from .basetest import BaseTestCase

Expand Down
2 changes: 0 additions & 2 deletions tests/test_login.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import json

import psycopg2

from .basetest import BaseTestCase
from .utils import registration


class TestAuthentication(BaseTestCase):
Expand Down
3 changes: 1 addition & 2 deletions tests/test_models.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import psycopg2

from .basetest import BaseTestCase
from utils import NotFound, create_tables
from utils import create_tables


class TestModels(BaseTestCase):
Expand Down
1 change: 0 additions & 1 deletion tests/test_movies.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import json

import psycopg2

from .basetest import BaseTestCase

Expand Down
1 change: 0 additions & 1 deletion tests/test_showtimes.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import json

import psycopg2

from .basetest import BaseTestCase

Expand Down
1 change: 0 additions & 1 deletion tests/test_tickets.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import json

import psycopg2
from .basetest import BaseTestCase


Expand Down
4 changes: 2 additions & 2 deletions views/todo.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def create():
todo = request.get_json()
controller = TodoController(todo)
new_todo = controller.save()
return jsonify(**todo), 201
return jsonify(**new_todo), 201


@todo.route("/<string:id>", methods=["GET"])
Expand All @@ -23,7 +23,7 @@ def get(id):
@todo.route("/<string:id>", methods=["DELETE"])
def delete(id):
controller = TodoController()
todo = controller.delete(id)
controller.delete(id)
return jsonify(message="Item has been deleted"), 200


Expand Down

0 comments on commit 37e914f

Please sign in to comment.