Skip to content

Commit

Permalink
lint backend
Browse files Browse the repository at this point in the history
  • Loading branch information
omera26 committed Nov 4, 2023
1 parent 57dc1cd commit 7fae671
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 28 deletions.
51 changes: 27 additions & 24 deletions backend/python/app/rest/child_routes.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
import json
import sys

from flask import Blueprint, current_app, jsonify, request

from ..middlewares.auth import require_authorization_by_role
from ..middlewares.validate import validate_request
from ..resources.daytime_contact_dto import DaytimeContactDTO, CreateDaytimeContactDTO
from ..resources.child_dto import ChildDTO, CreateChildDTO
from ..resources.daytime_contact_dto import CreateDaytimeContactDTO, DaytimeContactDTO
from ..services.implementations.child_service import ChildService
from ..services.implementations.provider_service import ProviderService
from ..services.implementations.daytime_contact_service import DaytimeContactService
from ..services.implementations.provider_service import ProviderService

child_service = ChildService(current_app.logger)
provider_service = ProviderService(current_app.logger)
daytimeContact_service = DaytimeContactService(current_app.logger)

blueprint = Blueprint("child", __name__, url_prefix="/children")


@blueprint.route("/", methods=["GET"], strict_slashes=False)
# @require_authorization_by_role({"Admin"})
def get_child():
Expand All @@ -33,12 +35,12 @@ def get_child():
"workerName": child.service_worker,
"specialNeeds": child.special_needs,
"concerns": [],
"childId": child.id
"childId": child.id,
}

#need to get by child_id instead
daytime_contact = (
daytimeContact_service.get_daytime_contact_by_intake_id(intake_id)
# need to get by child_id instead
daytime_contact = daytimeContact_service.get_daytime_contact_by_intake_id(
intake_id
)

provider_list = []
Expand All @@ -53,23 +55,23 @@ def get_child():
"address": provider.address,
"relationship": provider.relationship_to_child,
"contactNotes": provider.additional_contact_notes,
"status": "previous"
"status": "previous",
}
)

new_child = {
"childDetails": child_info,
"schoolDetails": daytime_contact,
"providers": provider_list,
}

new_children.append(new_child)

return jsonify(list(new_children)), 200

except Exception as error:
return jsonify(error), 400


@blueprint.route("/<int:intake_id>", methods=["POST"], strict_slashes=False)
# @require_authorization_by_role({"Admin"})
Expand All @@ -94,13 +96,15 @@ def run_undos():
}

try:
daytime_response = daytimeContact_service.create_new_daytime_contact(CreateDaytimeContactDTO(**daytimeContact_obj))
daytime_response = daytimeContact_service.create_new_daytime_contact(
CreateDaytimeContactDTO(**daytimeContact_obj)
)
print(daytime_response, file=sys.stderr)
undos.append((daytime_response,"delete_daytime_contact", daytime_response.id))
undos.append((daytime_response, "delete_daytime_contact", daytime_response.id))
except Exception as error:
run_undos()
return jsonify(error), 400

child_obj = {
"first_name": child_details["child_name"],
"last_name": ".",
Expand All @@ -109,7 +113,7 @@ def run_undos():
"cpin_number": child_details["cpin_file_number"],
"service_worker": child_details["worker_name"],
"special_needs": child_details["special_needs"],
"daytime_contact_id": daytime_response.id
"daytime_contact_id": daytime_response.id,
}

try:
Expand All @@ -118,8 +122,8 @@ def run_undos():
undos.append((child_service, "delete_child", child_response.id))
except Exception as error:
run_undos()
return jsonify(error), 400
return jsonify(error), 400

return jsonify(child_response.__dict__), 201


Expand All @@ -133,40 +137,39 @@ def run_undos():
for undo in undos:
service, fn, arg = undo
service.__dict__[fn](arg)

child_details = request.json["child_details"]
daytimeContact_details = request.json["school_details"]
daytimeContact_details = request.json["school_details"]
providers = request.json["providers"]

child_obj = {
"first_name": child_details["child_name"],
"last_name": ".",
"date_of_birth": child_details["date_of_birth"],
"cpin_number": child_details["cpin_file_number"],
"cpin_number": child_details["cpin_file_number"],
"service_worker": child_details["worker_name"],
"special_needs": child_details["special_needs"],
}

try:
child_response = child_service.edit_child(child_obj, child_details["child_id"])
#print(child_response, file=sys.stderr)
# print(child_response, file=sys.stderr)
# undos.append((child_service, "delete_child", child_response.id))
except Exception as error:
# run_undos()
return jsonify(error),400
return jsonify(error), 400

# daytimeContact_obj ={
# "name": daytimeContact_details["school_name"],
# "contact_information": daytimeContact_details["school_phone_no"],
# "address": daytimeContact_details["school_address"],
# "dismissal_time": daytimeContact_details["dismissal_time"],
# }

# try:
# try:
# daytime_response = daytimeContact_service.edit_daytime_contact(daytimeContact_obj, daytimeContact_details["school_id"])
# except Exception as error:
# # run_undos()
# return jsonify(error),400


return jsonify(child_response.__dict__), 200
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ def edit_child(self, child_data, child_id):
return ChildDTO(**child.to_dict())
except Exception as error:
db.session.rollback()

def get_children_by_intake_id(self, intake_id):
try:
children = Child.query.filter_by(intake_id=intake_id)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@ def create_new_daytime_contact(self, contact: CreateDaytimeContactDTO):
except Exception as error:
db.session.rollback()
raise error

def edit_daytime_contact(self, daytime_data, daytime_contact_id):
try:
daytime_contact = DaytimeContact.query.filter_by(id=daytime_contact_id).first()
daytime_contact = DaytimeContact.query.filter_by(
id=daytime_contact_id
).first()
if not daytime_contact:
raise Exception("Child with id {} not found".format(daytime_contact_id))
daytime_contact.name = daytime_data["name"]
Expand Down Expand Up @@ -88,7 +90,7 @@ def get_daytime_contact_by_intake_id(self, intake_id):
"schoolPhoneNo": daytime_contact.contact_information,
"schoolAddress": daytime_contact.address,
"dismissalTime": daytime_contact.dismissal_time,
"schoolId": daytime_contact.id
"schoolId": daytime_contact.id,
}
return result
else:
Expand All @@ -98,7 +100,7 @@ def get_daytime_contact_by_intake_id(self, intake_id):
"schoolPhoneNo": "",
"schoolAddress": "",
"dismissalTime": "",
"schoolID": ""
"schoolID": "",
},
)
except Exception as error:
Expand Down

0 comments on commit 7fae671

Please sign in to comment.