Log record many residents: Backend #192

braydonwang · 2023-11-05T06:30:44Z

Notion task link

Task Name

Implementation description

Database: log_record_residents association table between log record & resident tables
Backend: modify create, read, update, delete routes for logs to accommodate multiple residents per log

Steps to test

Migrate database: bash ./scripts/flask-db-upgrade.sh
Create log records through postman with no residents, one resident, or multiple residents. The corresponding rows should show up in the junction table.
Also test editing log records, deleting log records, and filtering log records by multiple residents

What should reviewers focus on?

Verify SQL query for filtering and database migration

Checklist

My PR name is descriptive and in imperative tense
My commit messages are descriptive and in imperative tense. My commits are atomic and trivial commits are squashed or fixup'd into non-trivial commits
I have run the appropriate linter(s)
I have requested a review from the PL, as well as other devs who have background knowledge on this PR or who will be building on top of this PR
If I have made API changes, I have updated the REST API Docs
IF I have made changes to the db/models, I have updated the Data Models Page
I have documented this PR in the Production Release Page
I have updated other Docs as needed

…print/supportive-housing into log-record-many-residents-frontend

…om/uwblueprint/supportive-housing into log-record-many-residents-frontend

into log-record-many-residents-frontend

…om/uwblueprint/supportive-housing into log-record-many-residents-frontend

into log-record-many-residents

…print/supportive-housing into log-record-many-residents-frontend

github-actions · 2023-11-05T06:45:20Z

Visit the preview URL for this PR (updated for commit 7432af9):

https://blueprintsupportivehousing--pr192-log-record-many-resi-zx87p792.web.app

_{(expires Thu, 30 Nov 2023 00:44:53 GMT)}

_{🔥 via Firebase Hosting GitHub Action 🌎}

_{Sign: f6bcdba7452bf82a6ec1a299c37d1bdff7870d09}

…print/supportive-housing into log-record-many-residents-frontend

connor-bechthold

Really great work!! Couple few comments to address (and also just reverting back to using the resident ID primary key), and this should be good to go

connor-bechthold · 2023-11-05T21:07:15Z

backend/app/services/implementations/log_records_service.py

+            FROM log_records logs\n \
+            LEFT JOIN users attn_tos ON logs.attn_to = attn_tos.id\n \
+            JOIN users employees ON logs.employee_id = employees.id \n \
+            LEFT JOIN\n \


Nit: Since this join statement is decently large and also used in the count function it can be put into a helper function similar to what join_tag_attributes does - can be named something like join_resident_attributes

backend/app/services/implementations/log_records_service.py

connor-bechthold · 2023-11-05T22:42:18Z

backend/app/services/implementations/log_records_service.py

-            JOIN users employees ON logs.employee_id = employees.id"
-
+            JOIN users employees ON logs.employee_id = employees.id\n\
+            LEFT JOIN\n \


Then you can just call the helper function here, similar to join_tag_attributes

connor-bechthold · 2023-11-05T23:34:01Z

backend/app/services/implementations/log_records_service.py

+        log_record = LogRecords.query.filter_by(log_id=log_id).first()
+        if log_record:
+            log_record.residents = []
+            if "residents" in updated_log_record:


residents should always be in a log record so this can be removed

This reverts commit 173d504.

…print/supportive-housing into log-record-many-residents-frontend

This reverts commit 3b03c7f.

…print/supportive-housing into log-record-many-residents-frontend

connor-bechthold

Could you resolve the merge conflicts? Just want to make sure that goes smoothly before testing everything again. Had a couple more small nits/q's to address but otherwise this should be good to go after!!

connor-bechthold · 2023-11-08T23:27:40Z

backend/app/services/implementations/log_records_service.py

@@ -158,6 +173,14 @@ def filter_log_records(self, filters=None):
                            sql = sql + "\nAND " + options[filter](filters.get(filter))
        return sql

+    def join_resident_attributes(self):
+        return "LEFT JOIN\n \
+                    (SELECT logs.log_id, string_to_array(string_agg(CAST(residents.id AS VARCHAR(10)), ','), ',') AS resident_ids, string_to_array(string_agg(CONCAT(residents.initial, residents.room_num), ','), ',') AS residents FROM log_records logs\n \


Instead of using string_to_array(string_agg()), you should be able to use ARRAY_AGG() instead to match the same functionality

Also I'm curious, is there a reason why you casted residents.id to a VARCHAR?

connor-bechthold · 2023-11-08T23:30:49Z

backend/app/services/implementations/log_records_service.py

            self.construct_tags(new_log_record, tag_names)

            db.session.add(new_log_record)
            db.session.commit()
-            return log_record
+            return {**log_record, "residents": residents}


Is there a reason why log_record isn't just returned?

into log-record-many-residents

…print/supportive-housing into log-record-many-residents-frontend

phamkelly17 · 2023-11-09T01:16:38Z

backend/app/services/implementations/log_records_service.py

@@ -246,6 +270,7 @@ def delete_log_record(self, log_id):
            raise Exception(
                "Log record with id {log_id} not found".format(log_id=log_id)
            )
+        log_record_to_delete.residents = []


why is log_record_to_delete.residents getting set to an empty list before getting deleted? Also, do the rows on the LogRecordResidents also need to get deleted?

when you set this to an empty list an call commit(), the ORM automatically deletes all associated rows in LogRecordResidents

connor-bechthold

LGTM this is the last major DB change that we'll need so having this done is great FANTASTIC WORK WITH THIS 😈 🔥

into log-record-many-residents-frontend

phamkelly17

lgtm

carolynzhang18 and others added 27 commits October 18, 2023 20:14

Create & migrate log_record_residents table

36431a6

changed add record function

a35cb81

change delete and update

e0a24b6

modify update logic

6514b56

change get function

9bd69f5

changed filtering by residents

9d5c234

modify comments

d10b09e

change filter logic again

7b21d72

initial frontend changes

377f486

fix count function

4694106

Merge branch 'log-record-many-residents' of https://github.com/uwblue…

3c198fa

…print/supportive-housing into log-record-many-residents-frontend

changing create and edit

5b8463b

Enable multiselect for residents

aaa05ce

small fixes

fd59b1d

Enable resident multiselect when creating log

5581997

Merge branch 'log-record-many-residents-frontend' of https://github.c…

6c3eae7

…om/uwblueprint/supportive-housing into log-record-many-residents-frontend

small changes

1afd52c

Fix residents array for API request

33255d3

Merge branch 'log-record-many-residents-frontend' of https://github.c…

1989013

…om/uwblueprint/supportive-housing into log-record-many-residents-frontend

Merge branch 'main' of https://github.com/uwblueprint/supportive-housing

369fca2

into log-record-many-residents-frontend

Merge branch 'log-record-many-residents-frontend' of https://github.c…

c9afb3f

…om/uwblueprint/supportive-housing into log-record-many-residents-frontend

Multiselect residents for edit log

39faf9c

testing some stuff

164a343

Merge branch 'log-record-many-residents-frontend' of https://github.c…

8dbcdd0

…om/uwblueprint/supportive-housing into log-record-many-residents-frontend

fix edit log

4f215de

Merge branch 'main' of https://github.com/uwblueprint/supportive-housing

82b0058

into log-record-many-residents

Merge branch 'log-record-many-residents' of https://github.com/uwblue…

b425faa

…print/supportive-housing into log-record-many-residents-frontend

braydonwang added 2 commits November 5, 2023 14:49

change migration files

d3e88e3

Merge branch 'log-record-many-residents' of https://github.com/uwblue…

0826196

…print/supportive-housing into log-record-many-residents-frontend

braydonwang and others added 5 commits November 5, 2023 15:38

send empty tags array

e1052c5

Merge branch 'log-record-many-residents' of https://github.com/uwblue…

96c5c8b

…print/supportive-housing into log-record-many-residents-frontend

change filter query to filter by initial + room num

173d504

Merge branch 'log-record-many-residents' of https://github.com/uwblue…

e9aa58b

…print/supportive-housing into log-record-many-residents-frontend

Pass resident labels

3b03c7f

connor-bechthold requested changes Nov 5, 2023

View reviewed changes

connor-bechthold reviewed Nov 5, 2023

View reviewed changes

braydonwang added 5 commits November 7, 2023 11:54

Revert "change filter query to filter by initial + room num"

d0edc2e

This reverts commit 173d504.

Merge branch 'log-record-many-residents' of https://github.com/uwblue…

dcb7ebf

…print/supportive-housing into log-record-many-residents-frontend

Revert "Pass resident labels"

eeb065e

This reverts commit 3b03c7f.

resolve pr comments

542c07f

Merge branch 'log-record-many-residents' of https://github.com/uwblue…

f78c477

…print/supportive-housing into log-record-many-residents-frontend

braydonwang requested a review from connor-bechthold November 7, 2023 17:50

connor-bechthold requested changes Nov 8, 2023

View reviewed changes

braydonwang added 6 commits November 8, 2023 19:50

Merge branch 'main' of https://github.com/uwblueprint/supportive-housing

7025bb6

into log-record-many-residents

run lint function

c8a023b

Merge branch 'log-record-many-residents' of https://github.com/uwblue…

0bd754a

…print/supportive-housing into log-record-many-residents-frontend

run linter

02b8f0c

resolve PR comments

223f208

Merge branch 'log-record-many-residents' of https://github.com/uwblue…

aefae7a

…print/supportive-housing into log-record-many-residents-frontend

phamkelly17 reviewed Nov 9, 2023

View reviewed changes

connor-bechthold approved these changes Nov 12, 2023

View reviewed changes

braydonwang requested a review from phamkelly17 November 12, 2023 19:13

carolynzhang18 added 2 commits November 12, 2023 14:22

Merge branch 'main' of https://github.com/uwblueprint/supportive-housing

a25c21d

into log-record-many-residents-frontend

Style residents dropdown

81ab53d

phamkelly17 approved these changes Nov 16, 2023

View reviewed changes

Minor style fixes

7432af9

braydonwang merged commit 90a181e into main Nov 23, 2023
4 checks passed

braydonwang deleted the log-record-many-residents branch November 23, 2023 00:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Log record many residents: Backend #192

Log record many residents: Backend #192

braydonwang commented Nov 5, 2023

github-actions bot commented Nov 5, 2023 •

edited

Loading

connor-bechthold left a comment

connor-bechthold Nov 5, 2023

connor-bechthold Nov 5, 2023

connor-bechthold Nov 5, 2023

connor-bechthold left a comment

connor-bechthold Nov 8, 2023

connor-bechthold Nov 8, 2023

phamkelly17 Nov 9, 2023

connor-bechthold Nov 12, 2023

connor-bechthold left a comment

phamkelly17 left a comment

Log record many residents: Backend #192

Log record many residents: Backend #192

Conversation

braydonwang commented Nov 5, 2023

Notion task link

Implementation description

Steps to test

What should reviewers focus on?

Checklist

github-actions bot commented Nov 5, 2023 • edited Loading

connor-bechthold left a comment

Choose a reason for hiding this comment

connor-bechthold Nov 5, 2023

Choose a reason for hiding this comment

connor-bechthold Nov 5, 2023

Choose a reason for hiding this comment

connor-bechthold Nov 5, 2023

Choose a reason for hiding this comment

connor-bechthold left a comment

Choose a reason for hiding this comment

connor-bechthold Nov 8, 2023

Choose a reason for hiding this comment

connor-bechthold Nov 8, 2023

Choose a reason for hiding this comment

phamkelly17 Nov 9, 2023

Choose a reason for hiding this comment

connor-bechthold Nov 12, 2023

Choose a reason for hiding this comment

connor-bechthold left a comment

Choose a reason for hiding this comment

phamkelly17 left a comment

Choose a reason for hiding this comment

github-actions bot commented Nov 5, 2023 •

edited

Loading