Skip to content

Commit

Permalink
Added CORS
Browse files Browse the repository at this point in the history
  • Loading branch information
taranjitkaurme committed Dec 17, 2023
1 parent 87fd8ab commit 064fa7b
Show file tree
Hide file tree
Showing 7 changed files with 441 additions and 429 deletions.
1 change: 1 addition & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ flask-restful = "*"
flask-testing = "*"
pytest = "*"
sphinx-rtd-theme = "*"
flask-cors = "*"

[dev-packages]
pipdeptree = "*"
Expand Down
833 changes: 421 additions & 412 deletions Pipfile.lock

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions app.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
from src.resources.usercompanymapping_resource import UserCompanyMappingResource
from src.resources.position_resource import PositionResource
from src.database.database import db
from flask_cors import CORS


app = Flask(__name__)
CORS(app)
api = Api(app)

# Configure the database URI
Expand Down
4 changes: 2 additions & 2 deletions src/models/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ class User(db.Model):
Attributes:
user_id (int): The unique identifier for the user.
url_link (str): The unique URL link associated with the user.
url (str): The unique URL link associated with the user.
name (str): The name of the user.
"""

__tablename__ = "user"

user_id = db.Column(db.Integer, primary_key=True)
url_link = db.Column(db.String(255), unique=True)
url = db.Column(db.String(255), unique=True)
name = db.Column(db.String(255))
# location_id = db.Column(db.Integer, db.ForeignKey('location.location_id'))

Expand Down
10 changes: 5 additions & 5 deletions src/resources/user_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class UserResource(Resource):
Request JSON Payload (for POST and PUT operations):
{
"url_link": "User URL Link",
"url: "User URL Link",
"name": "User Name"
}
Expand All @@ -59,11 +59,11 @@ def get(self, user_id=None):
def post(self):
try:
parser = reqparse.RequestParser()
parser.add_argument('url_link', type=str, required=True, help='url_link is required')
parser.add_argument('url', type=str, required=True, help='url is required')
parser.add_argument('name', type=str, required=True, help='name is required')
args = parser.parse_args()

response = UserService.create_user(url_link=args['url_link'], name=args['name'])
response = UserService.create_user(url=args['url'], name=args['name'])

return {"message": response}, 201
except Exception as e:
Expand All @@ -73,11 +73,11 @@ def post(self):
def put(self, user_id):
try:
parser = reqparse.RequestParser()
parser.add_argument('url_link', type=str)
parser.add_argument('url', type=str)
parser.add_argument('name', type=str)
args = parser.parse_args()

response = UserService.update_user(user_id, url_link=args['url_link'], name=args['name'])
response = UserService.update_user(user_id, url=args['url'], name=args['name'])

if response:
return {"message": "User updated successfully"}
Expand Down
14 changes: 7 additions & 7 deletions src/services/user_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ def get_user(user_id):
user = User.query.get(user_id)
if not user:
return {"message": "User not found"}, 404
return {"user_id": user.user_id, "url_link": user.url_link, "name": user.name}
return {"user_id": user.user_id, "url": user.url, "name": user.name}
else:
users = User.query.all()
return [{"user_id": user.user_id, "url_link": user.url_link, "name": user.name} for user in users]
return [{"user_id": user.user_id, "url": user.url, "name": user.name} for user in users]
except Exception as e:
# Log the exception or handle it accordingly
return {"message": f"Error in get_user: {str(e)}"}, 500

@staticmethod
def create_user(url_link, name):
def create_user(url, name):
try:
new_user = User(url_link=url_link, name=name)
new_user = User(url=url, name=name)
db.session.add(new_user)
db.session.commit()
return {"message": "User created successfully"}, 201
Expand All @@ -31,12 +31,12 @@ def create_user(url_link, name):
return {"message": f"Error in create_user: {str(e)}"}, 500

@staticmethod
def update_user(user_id, url_link=None, name=None):
def update_user(user_id, url=None, name=None):
try:
user = User.query.get(user_id)
if user:
if url_link:
user.url_link = url_link
if url:
user.url = url
if name:
user.name = name
db.session.commit()
Expand Down
6 changes: 3 additions & 3 deletions test/test_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def test_create_user(app):
"""
# Test creating a new user
with app.app_context():
result = UserService.create_user(url_link='new_url', name='New User')
result = UserService.create_user(url='new_url', name='New User')

# Assertions
assert result[0]["message"] == "User created successfully"
Expand All @@ -22,7 +22,7 @@ def test_get_user(app):
result = UserService.get_user(1)

# Assertions
assert result == {"user_id": 1, "url_link": 'new_url', "name": 'New User'}
assert result == {"user_id": 1, "url": 'new_url', "name": 'New User'}


def test_update_user(app):
Expand All @@ -31,7 +31,7 @@ def test_update_user(app):
"""
with app.app_context():
# Test updating a user
result = UserService.update_user(1, url_link='updated_url', name='Updated User')
result = UserService.update_user(1, url='updated_url', name='Updated User')
print(result)
# Assertions
assert result["message"] == "User updated successfully"
Expand Down

0 comments on commit 064fa7b

Please sign in to comment.