From 10de49fbf19908434799e3b027141f4158964f9f Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@purdue.edu>
Date: Wed, 16 Jun 2021 16:12:17 -0400
Subject: [PATCH] Import parser.Item as _Item and rename ItemResource to Item

---
 src/webqueue2api/api/app.py                | 4 ++--
 src/webqueue2api/api/resources/__init__.py | 2 +-
 src/webqueue2api/api/resources/item.py     | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/webqueue2api/api/app.py b/src/webqueue2api/api/app.py
index 0be9c55..486ad81 100644
--- a/src/webqueue2api/api/app.py
+++ b/src/webqueue2api/api/app.py
@@ -2,7 +2,7 @@
 from flask_restful import Api
 from flask_jwt_extended import JWTManager
 from .config import config
-from .resources import Login, RefreshAccessToken, ItemResource
+from .resources import Login, RefreshAccessToken, Item
 
 app = Flask(__name__)
 api = Api(app)
@@ -32,4 +32,4 @@
 
 api.add_resource(Login, "/api/login")
 api.add_resource(RefreshAccessToken, "/api/tokens/refresh")
-api.add_resource(ItemResource, "/api/data/<string:queue>/<int:number>")
\ No newline at end of file
+api.add_resource(Item, "/api/data/<string:queue>/<int:number>")
\ No newline at end of file
diff --git a/src/webqueue2api/api/resources/__init__.py b/src/webqueue2api/api/resources/__init__.py
index 92e5ea1..7e848b0 100644
--- a/src/webqueue2api/api/resources/__init__.py
+++ b/src/webqueue2api/api/resources/__init__.py
@@ -1,3 +1,3 @@
 from .login import Login
 from .refresh_access_token import RefreshAccessToken
-from .item import ItemResource
\ No newline at end of file
+from .item import Item
\ No newline at end of file
diff --git a/src/webqueue2api/api/resources/item.py b/src/webqueue2api/api/resources/item.py
index 0981100..22b60e7 100644
--- a/src/webqueue2api/api/resources/item.py
+++ b/src/webqueue2api/api/resources/item.py
@@ -1,9 +1,10 @@
 from flask_restful import Resource
 from flask_jwt_extended import jwt_required
-from webqueue2api.parser import Item
+# To avoid naming conflicts
+from webqueue2api.parser import Item as _Item
 from webqueue2api.parser.errors import ItemDoesNotExistError
 
-class ItemResource(Resource):
+class Item(Resource):
     # @jwt_required
     def get(self, queue: str, number: int) -> tuple:
         """Returns the JSON representation of the item requested.
@@ -38,6 +39,6 @@ def get(self, queue: str, number: int) -> tuple:
             tuple: Item as JSON and HTTP response code.
         """
         try:
-            return (Item(queue, number).toJson(), 200)
+            return (_Item(queue, number).toJson(), 200)
         except ItemDoesNotExistError:
             return ({"message": f"Item {queue}{number} not found."}, 404)
\ No newline at end of file