Skip to content

Commit ef83b1e

Browse files
omera26omera26
committed
lint code
1 parent 4e64eb6 commit ef83b1e

File tree

12 files changed

+61
-56
lines changed

12 files changed

+61
-56
lines changed

‎backend/python/app/rest/child_routes.py

+27-24
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
import json
22
import sys
3+
34
from flask import Blueprint, current_app, jsonify, request
45

56
from ..middlewares.auth import require_authorization_by_role
67
from ..middlewares.validate import validate_request
7-
from ..resources.daytime_contact_dto import DaytimeContactDTO, CreateDaytimeContactDTO
88
from ..resources.child_dto import ChildDTO, CreateChildDTO
9+
from ..resources.daytime_contact_dto import CreateDaytimeContactDTO, DaytimeContactDTO
910
from ..services.implementations.child_service import ChildService
10-
from ..services.implementations.provider_service import ProviderService
1111
from ..services.implementations.daytime_contact_service import DaytimeContactService
12+
from ..services.implementations.provider_service import ProviderService
1213

1314
child_service = ChildService(current_app.logger)
1415
provider_service = ProviderService(current_app.logger)
1516
daytimeContact_service = DaytimeContactService(current_app.logger)
1617

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

20+
1921
@blueprint.route("/", methods=["GET"], strict_slashes=False)
2022
# @require_authorization_by_role({"Admin"})
2123
def get_child():
@@ -33,12 +35,12 @@ def get_child():
3335
"workerName": child.service_worker,
3436
"specialNeeds": child.special_needs,
3537
"concerns": [],
36-
"childId": child.id
38+
"childId": child.id,
3739
}
3840

39-
#need to get by child_id instead
40-
daytime_contact = (
41-
daytimeContact_service.get_daytime_contact_by_intake_id(intake_id)
41+
# need to get by child_id instead
42+
daytime_contact = daytimeContact_service.get_daytime_contact_by_intake_id(
43+
intake_id
4244
)
4345

4446
provider_list = []
@@ -53,23 +55,23 @@ def get_child():
5355
"address": provider.address,
5456
"relationship": provider.relationship_to_child,
5557
"contactNotes": provider.additional_contact_notes,
56-
"status": "previous"
58+
"status": "previous",
5759
}
5860
)
59-
61+
6062
new_child = {
6163
"childDetails": child_info,
6264
"schoolDetails": daytime_contact,
6365
"providers": provider_list,
6466
}
6567

6668
new_children.append(new_child)
67-
69+
6870
return jsonify(list(new_children)), 200
6971

7072
except Exception as error:
7173
return jsonify(error), 400
72-
74+
7375

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

9698
try:
97-
daytime_response = daytimeContact_service.create_new_daytime_contact(CreateDaytimeContactDTO(**daytimeContact_obj))
99+
daytime_response = daytimeContact_service.create_new_daytime_contact(
100+
CreateDaytimeContactDTO(**daytimeContact_obj)
101+
)
98102
print(daytime_response, file=sys.stderr)
99-
undos.append((daytime_response,"delete_daytime_contact", daytime_response.id))
103+
undos.append((daytime_response, "delete_daytime_contact", daytime_response.id))
100104
except Exception as error:
101105
run_undos()
102106
return jsonify(error), 400
103-
107+
104108
child_obj = {
105109
"first_name": child_details["child_name"],
106110
"last_name": ".",
@@ -109,7 +113,7 @@ def run_undos():
109113
"cpin_number": child_details["cpin_file_number"],
110114
"service_worker": child_details["worker_name"],
111115
"special_needs": child_details["special_needs"],
112-
"daytime_contact_id": daytime_response.id
116+
"daytime_contact_id": daytime_response.id,
113117
}
114118

115119
try:
@@ -118,8 +122,8 @@ def run_undos():
118122
undos.append((child_service, "delete_child", child_response.id))
119123
except Exception as error:
120124
run_undos()
121-
return jsonify(error), 400
122-
125+
return jsonify(error), 400
126+
123127
return jsonify(child_response.__dict__), 201
124128

125129

@@ -133,40 +137,39 @@ def run_undos():
133137
for undo in undos:
134138
service, fn, arg = undo
135139
service.__dict__[fn](arg)
136-
140+
137141
child_details = request.json["child_details"]
138-
daytimeContact_details = request.json["school_details"]
142+
daytimeContact_details = request.json["school_details"]
139143
providers = request.json["providers"]
140144

141145
child_obj = {
142146
"first_name": child_details["child_name"],
143147
"last_name": ".",
144148
"date_of_birth": child_details["date_of_birth"],
145-
"cpin_number": child_details["cpin_file_number"],
149+
"cpin_number": child_details["cpin_file_number"],
146150
"service_worker": child_details["worker_name"],
147151
"special_needs": child_details["special_needs"],
148152
}
149153

150154
try:
151155
child_response = child_service.edit_child(child_obj, child_details["child_id"])
152-
#print(child_response, file=sys.stderr)
156+
# print(child_response, file=sys.stderr)
153157
# undos.append((child_service, "delete_child", child_response.id))
154158
except Exception as error:
155159
# run_undos()
156-
return jsonify(error),400
157-
160+
return jsonify(error), 400
161+
158162
# daytimeContact_obj ={
159163
# "name": daytimeContact_details["school_name"],
160164
# "contact_information": daytimeContact_details["school_phone_no"],
161165
# "address": daytimeContact_details["school_address"],
162166
# "dismissal_time": daytimeContact_details["dismissal_time"],
163167
# }
164168

165-
# try:
169+
# try:
166170
# daytime_response = daytimeContact_service.edit_daytime_contact(daytimeContact_obj, daytimeContact_details["school_id"])
167171
# except Exception as error:
168172
# # run_undos()
169173
# return jsonify(error),400
170174

171-
172175
return jsonify(child_response.__dict__), 200

‎backend/python/app/services/implementations/child_service.py

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ def edit_child(self, child_data, child_id):
6767
return ChildDTO(**child.to_dict())
6868
except Exception as error:
6969
db.session.rollback()
70+
7071
def get_children_by_intake_id(self, intake_id):
7172
try:
7273
children = Child.query.filter_by(intake_id=intake_id)

‎backend/python/app/services/implementations/daytime_contact_service.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ def create_new_daytime_contact(self, contact: CreateDaytimeContactDTO):
3838
except Exception as error:
3939
db.session.rollback()
4040
raise error
41-
41+
4242
def edit_daytime_contact(self, daytime_data, daytime_contact_id):
4343
try:
44-
daytime_contact = DaytimeContact.query.filter_by(id=daytime_contact_id).first()
44+
daytime_contact = DaytimeContact.query.filter_by(
45+
id=daytime_contact_id
46+
).first()
4547
if not daytime_contact:
4648
raise Exception("Child with id {} not found".format(daytime_contact_id))
4749
daytime_contact.name = daytime_data["name"]
@@ -88,7 +90,7 @@ def get_daytime_contact_by_intake_id(self, intake_id):
8890
"schoolPhoneNo": daytime_contact.contact_information,
8991
"schoolAddress": daytime_contact.address,
9092
"dismissalTime": daytime_contact.dismissal_time,
91-
"schoolId": daytime_contact.id
93+
"schoolId": daytime_contact.id,
9294
}
9395
return result
9496
else:
@@ -98,7 +100,7 @@ def get_daytime_contact_by_intake_id(self, intake_id):
98100
"schoolPhoneNo": "",
99101
"schoolAddress": "",
100102
"dismissalTime": "",
101-
"schoolID": ""
103+
"schoolID": "",
102104
},
103105
)
104106
except Exception as error:

‎frontend/src/components/intake/IndividualDetails.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from "react";
22
import { Button, VStack, Text, HStack, Icon, Divider } from "@chakra-ui/react";
33
import { ArrowRight } from "react-feather";
44
import { Caregivers } from "../../types/CaregiverDetailTypes";
5-
import { Children } from "../../types/ChildTypes"
5+
import { Children } from "../../types/ChildTypes";
66

77
type IndividualDetailsProps = {
88
childrenDetails: Children;

‎frontend/src/components/intake/NewProviderModal.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ const NewProviderModal = ({
235235
relationship: relationshipChanged
236236
? relationship
237237
: provider.relationship,
238-
status: ""
238+
status: "",
239239
};
240240
onClick(newProvider);
241241
handleClose();

‎frontend/src/components/intake/ReviewCaseForm.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ const ReviewForm = ({
116116
<Stack padding="32px" spacing="16px">
117117
<HStack w="full" display="flex" justifyContent="space-between">
118118
<Text color="b&w.black" textStyle="header-large">
119-
Program details
119+
Program details
120120
</Text>
121121
{editSectionButton(IntakeSteps.PROGRAM_DETAILS)};
122122
</HStack>

‎frontend/src/components/intake/child-information/AddChildPage.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ enum AddChildSteps {
2020

2121
type AddChildProps = {
2222
allProviders: Providers;
23-
setAllProviders: (newProviders: Providers) => void | React.Dispatch<React.SetStateAction<Providers>>;
23+
setAllProviders: (
24+
newProviders: Providers,
25+
) => void | React.Dispatch<React.SetStateAction<Providers>>;
2426
setStep: React.Dispatch<React.SetStateAction<number>>;
2527
childrens: Children;
2628
setChildren: (newChildren: Children) => void;
@@ -76,7 +78,6 @@ const AddChild = ({
7678

7779
if (selectedIndexChild >= 0) {
7880
childrens.splice(selectedIndexChild, 1, child);
79-
console.log(child)
8081
if (caseNumber) {
8182
childAPIClient.put({
8283
updatedChild: child,

‎frontend/src/components/intake/child-information/ChildProviderForm.tsx

+8-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ export type ChildProviderFormProps = {
1212
providers: Providers;
1313
setProviders: React.Dispatch<React.SetStateAction<Providers>>;
1414
allProviders: Providers;
15-
setAllProviders: (newProviders: Providers) => void | React.Dispatch<React.SetStateAction<Providers>> ;
15+
setAllProviders: (
16+
newProviders: Providers,
17+
) => void | React.Dispatch<React.SetStateAction<Providers>>;
1618
};
1719

1820
const ChildProviderForm = ({
@@ -36,12 +38,12 @@ const ChildProviderForm = ({
3638
} = useDisclosure();
3739

3840
const onClickNewProvider = (newProvider: ProviderDetails) => {
39-
const provider: ProviderDetails = newProvider
41+
const provider: ProviderDetails = newProvider;
4042
if (selectedIndex >= 0) {
41-
provider.status = "edited"
43+
provider.status = "edited";
4244
providers.splice(selectedIndex, 1, provider);
4345
} else {
44-
provider.status = "created"
46+
provider.status = "created";
4547
providers.push(provider);
4648
allProviders.push(provider);
4749
}
@@ -55,6 +57,7 @@ const ChildProviderForm = ({
5557
};
5658

5759
const deleteProvider = (index: number) => {
60+
providers.splice(index, 1);
5861
// this isn't really useful, but it helps refresh the component
5962
// ideally should have something useEffect, but current way of passing data does not work well with it
6063
setProvidersDeleted(providersDeleted + 1);
@@ -80,7 +83,7 @@ const ChildProviderForm = ({
8083
contactNotes: "",
8184
address: "",
8285
relationship: "",
83-
status: ""
86+
status: "",
8487
};
8588

8689
return (

‎frontend/src/components/intake/indivDetails/ChildrenForm.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import PromptBox, { IndividualDetailsOverview } from "../PromptBox";
55
import IntakeSteps from "../intakeSteps";
66
import { Children } from "../../../types/ChildTypes";
77

8-
98
type ChildrenFormProps = {
109
childrens: Children;
1110
setChildren: React.Dispatch<React.SetStateAction<Children>>;

‎frontend/src/components/pages/CaseOverview.tsx

+5-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
Text,
1010
useDisclosure,
1111
} from "@chakra-ui/react";
12-
import { ArrowLeft, ArrowRight, UserPlus } from "react-feather";
12+
import { ArrowLeft, UserPlus } from "react-feather";
1313
import IntakeHeader from "../intake/IntakeHeader";
1414
import CaseOverviewFooter from "../overview/CaseOverviewFooter";
1515
import colors from "../../theme/colors";
@@ -384,9 +384,6 @@ const CaseOverviewBody = ({
384384
const CaseOverview = (): React.ReactElement => {
385385
const [sectionIndex, setSectionIndex] = useState(0);
386386

387-
const [allProviders, setAllProviders] = useState<Providers>([]);
388-
const [children, setChildren] = useState<Children>([]);
389-
390387
const { id } = useParams<{ id: string }>();
391388
const caseNumber: number = parseInt(id, 10);
392389

@@ -419,16 +416,16 @@ const CaseOverview = (): React.ReactElement => {
419416
}
420417
}
421418

422-
setCaseData({
423-
...caseData,
419+
setCaseData((data: CaseOverviewData) => ({
420+
...data,
424421
caregiversList: caregivers,
425422
childrenList: childrenData,
426423
providerList: childProviders,
427-
});
424+
}));
428425
};
429426

430427
fetchData();
431-
}, []);
428+
}, [caseNumber]);
432429

433430
switch (sectionIndex) {
434431
case OverviewSection.MAIN_SECTION: {

‎frontend/src/types/ChildTypes.ts

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { Providers } from "../components/intake/NewProviderModal";
22
import { ChildDetails } from "../components/intake/child-information/ChildInformationForm";
3-
import{ SchoolDetails } from "../components/intake/child-information/SchoolDaycareForm";
3+
import { SchoolDetails } from "../components/intake/child-information/SchoolDaycareForm";
44

55
export type ChildrenDetails = {
6-
childDetails: ChildDetails;
7-
schoolDetails: SchoolDetails;
8-
providers: Providers;
9-
};
6+
childDetails: ChildDetails;
7+
schoolDetails: SchoolDetails;
8+
providers: Providers;
9+
};
1010

1111
export type Children = ChildrenDetails[];
12-

‎frontend/src/types/OverviewSection.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
enum OverviewSection {
2-
MAIN_SECTION,
3-
CHILD_SECTION,
2+
MAIN_SECTION,
3+
CHILD_SECTION,
44
}
55

6-
export default OverviewSection;
6+
export default OverviewSection;

0 commit comments

Comments
 (0)