|
1 | | -from flask import make_response, abort |
| 1 | +from flask import abort, make_response |
2 | 2 |
|
3 | 3 | from config import db |
4 | | -from models import ( |
5 | | - Person, |
6 | | - PersonSchema, |
7 | | -) |
| 4 | +from models import Person, people_schema, person_schema |
8 | 5 |
|
9 | 6 |
|
10 | 7 | def read_all(): |
11 | 8 | people = Person.query.all() |
12 | | - person_schema = PersonSchema(many=True) |
13 | | - return person_schema.dump(people) |
| 9 | + return people_schema.dump(people) |
14 | 10 |
|
15 | 11 |
|
16 | 12 | def create(person): |
17 | | - schema = PersonSchema() |
18 | | - new_person = schema.load(person, session=db.session) |
19 | | - db.session.add(new_person) |
20 | | - db.session.commit() |
21 | | - return schema.dump(new_person), 201 |
| 13 | + lname = person.get("lname") |
| 14 | + existing_person = Person.query.filter(Person.lname == lname).one_or_none() |
| 15 | + |
| 16 | + if existing_person is None: |
| 17 | + new_person = person_schema.load(person, session=db.session) |
| 18 | + db.session.add(new_person) |
| 19 | + db.session.commit() |
| 20 | + return person_schema.dump(new_person), 201 |
| 21 | + else: |
| 22 | + abort(406, f"Person with last name {lname} already exists") |
22 | 23 |
|
23 | 24 |
|
24 | | -def read_one(person_id): |
25 | | - person = Person.query.get(person_id) |
| 25 | +def read_one(lname): |
| 26 | + person = Person.query.filter(Person.lname == lname).one_or_none() |
26 | 27 |
|
27 | 28 | if person is not None: |
28 | | - person_schema = PersonSchema() |
29 | 29 | return person_schema.dump(person) |
30 | 30 | else: |
31 | | - abort(404, f"Person with ID {person_id} not found") |
| 31 | + abort(404, f"Person with last name {lname} not found") |
32 | 32 |
|
33 | 33 |
|
34 | | -def update(person_id, person): |
35 | | - existing_person = Person.query.get(person_id) |
| 34 | +def update(lname, person): |
| 35 | + existing_person = Person.query.filter(Person.lname == lname).one_or_none() |
36 | 36 |
|
37 | 37 | if existing_person: |
38 | | - schema = PersonSchema() |
39 | | - update_person = schema.load(person, session=db.session) |
| 38 | + update_person = person_schema.load(person, session=db.session) |
40 | 39 | existing_person.fname = update_person.fname |
41 | 40 | db.session.merge(existing_person) |
42 | 41 | db.session.commit() |
43 | | - return schema.dump(existing_person), 201 |
| 42 | + return person_schema.dump(existing_person), 201 |
44 | 43 | else: |
45 | | - abort(404, f"Person with ID {person_id} not found") |
| 44 | + abort(404, f"Person with last name {lname} not found") |
46 | 45 |
|
47 | 46 |
|
48 | | -def delete(person_id): |
49 | | - existing_person = Person.query.get(person_id) |
| 47 | +def delete(lname): |
| 48 | + existing_person = Person.query.filter(Person.lname == lname).one_or_none() |
50 | 49 |
|
51 | 50 | if existing_person: |
52 | 51 | db.session.delete(existing_person) |
53 | 52 | db.session.commit() |
54 | | - return make_response(f"{person_id} successfully deleted", 200) |
| 53 | + return make_response(f"{lname} successfully deleted", 200) |
55 | 54 | else: |
56 | | - abort(404, f"Person with ID {person_id} not found") |
| 55 | + abort(404, f"Person with last name {lname} not found") |
0 commit comments