Remove unnecessary joins from develop branch #645

reidn3r · 2024-09-19T11:16:05Z

Now, from develop branch:

These change tries to solve the issue Refactor user fetching to remove unnessary joins #454
Refactored the getUserByFirebaseId function to only fetch the user data, removing unnecessary joins/relations.
Searched for any functions that rely on req['userEntity'] to ensure no existing functionality is broken. I found no instances of such functions, so it seems ok.
Ran all tests and confirmed they passed successfully

* Update dockerfile to node version 16 6366307229 / Create subscriptions table * Add subscription entity This will hold any subscriotions related to Bloom. For now, this will be whatsapp but in the future, we may also have email subscriptions. 6366307229 / Create subscriptions table * Create user subscription table This will hold information on the subscriptions a user has. It will also hold information on when a subscription was cancelled. 882f38dfea / Create user subscriptions table * Add migration to create subscription user table 882f38dfea / Create user subscriptions table * Add test fixes 882f38dfea / Create user subscriptions table

Merge to bring in whatsapp subscription endpoint to main

These were missed out in the original migration which created subscription tables.

The base entity which brings in the createdAt and updatedAt fields automatically has now been renamed to base bloom entity. This prevents the type orm base entity from being imported by mistake when the intention is to import the bloom base entity. 5bc71b407d

Merge develop to main

Merge develop into main

Merge develop to main

Merge Develop into Main

6b935e1bc5 / Add verification for whatsapp endpoints

Add logging and add status enum for when subscription already exists. Also added number sanitization to the service. This prevents numbers with white spaces being accepted by the whatsapp endpoint. 6b935e1bc5 / Add verification for whatsapp endpoints

6b935e1bc5 / Add verification for whatsapp endpoints

6b935e1bc5 / Improvements for whatsapp backend

Once a subscription is created, the created object is then used to retrieve the full subscription info. This includes the subscription name. This will allow the front end to parse different subscriptions as needed. 6b935e1bc5 / Improvements for whatsapp backend

This will allow the front end to parse different subscriptions as needed. 6b935e1bc5 / Improvements for whatsapp backend

6b935e1bc5 / Improvements for whatsapp backend

Create new course user if missing

Update error status code to 401 when ID token expired

Update partner-access table to remove unique user constraint

Merge Develop onto Main

Release therapy email case sensitivity fix, cypress delete user route and better error handling

Release new logging & dependency updates

Update therapy session table to handle null & fix issue with session completion

Merge Develop onto Main

Merge Develop into main

Merge Dev onto Main

Merge Develop onto Main

Merge develop onto Main

Merge Develop onto Main

eleanorreem · 2024-09-20T17:55:59Z

@reidn3r Thanks for this! This all works for me - the git history is just a bit strange. Is there any way of you fixing this?

reidn3r · 2024-09-20T21:59:18Z

@eleanorreem Maybe it was strange because my branch was some commits behind from base branch?? I've updated the branch via GitHub, and I believe it's correct now.

Sorry for these mistakes, its my first open source contribution 😬

kyleecodes · 2024-09-22T22:10:58Z

@reidn3r Thanks for opening a new PR.
I see the same issue persist. I suggest syncing your forked develop branch, creating a new branch from the updated develop branch, and reimplementing the same changes in a new PR. See guidance on how to update your fork here: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

reidn3r · 2024-09-22T23:59:46Z

@kyleecodes @eleanorreem
I created a new branch from the synced develop branch and reimplemented the code. I opened a new PR and you can find it here

Hope it's correct now

swetha-charles and others added 30 commits January 24, 2023 17:43

Merge branch 'develop'

b24fb04

Merge to bring in whatsapp subscription endpoint to main

Add migration for createdAt and updatedAt fields

ee5cc19

These were missed out in the original migration which created subscription tables.

Merge pull request chaynHQ#263 from chaynHQ/develop

e88e8ac

Merge develop to main

Merge pull request chaynHQ#267 from chaynHQ/develop

8fd4628

Merge develop into main

Merge pull request chaynHQ#269 from chaynHQ/develop

946ee12

Merge develop to main

Merge pull request chaynHQ#273 from chaynHQ/develop

c516351

Merge Develop into Main

Add return types for subscription-user controller methods

f76c840

6b935e1bc5 / Add verification for whatsapp endpoints

Add accurate log for zapier trigger

1d863cf

6b935e1bc5 / Add verification for whatsapp endpoints

Add extra logging for respond.io triggers

c37d697

6b935e1bc5 / Improvements for whatsapp backend

Fix missing id in subscription response

5271394

6b935e1bc5 / Improvements for whatsapp backend

Send subscription name in payload on unsubscribe

27dae4a

This will allow the front end to parse different subscriptions as needed. 6b935e1bc5 / Improvements for whatsapp backend

Add better logging for errors

a13480a

6b935e1bc5 / Improvements for whatsapp backend

Merge pull request chaynHQ#277 from chaynHQ/develop

ad89f3f

Create new course user if missing

Merge pull request chaynHQ#280 from chaynHQ/develop

29149b4

Update error status code to 401 when ID token expired

Merge pull request chaynHQ#282 from chaynHQ/develop

2358dbe

Update partner-access table to remove unique user constraint

Merge pull request chaynHQ#284 from chaynHQ/develop

77d4965

Merge Develop onto Main

Merge pull request chaynHQ#288 from chaynHQ/develop

3a10ae7

Release therapy email case sensitivity fix, cypress delete user route and better error handling

Merge pull request chaynHQ#290 from chaynHQ/develop

d71e297

Release new logging & dependency updates

Merge pull request chaynHQ#293 from chaynHQ/develop

60fa375

Update therapy session table to handle null & fix issue with session completion

Merge pull request chaynHQ#299 from chaynHQ/develop

595af2f

Merge Develop onto Main

Merge pull request chaynHQ#301 from chaynHQ/develop

f0210b3

Merge Develop into main

Merge pull request chaynHQ#305 from chaynHQ/develop

09df0f2

Merge Dev onto Main

Merge pull request chaynHQ#316 from chaynHQ/develop

764c541

Merge Develop onto Main

Merge pull request chaynHQ#318 from chaynHQ/develop

e6a4ff1

Merge Develop onto Main

Merge pull request chaynHQ#327 from chaynHQ/develop

f5e7b1b

Merge Develop onto Main

Merge pull request chaynHQ#334 from chaynHQ/develop

881a3d3

Merge develop onto Main

annarhughes and others added 22 commits June 4, 2024 21:50

Merge pull request chaynHQ#447 from chaynHQ/develop

208e91c

Merge Develop onto Main

Merge pull request chaynHQ#451 from chaynHQ/develop

b172adc

Merge Develop onto Main

Merge pull request chaynHQ#455 from chaynHQ/develop

fb5ce99

Merge Develop onto Main

Merge pull request chaynHQ#470 from chaynHQ/develop

b784543

Merge Develop onto Main

Merge pull request chaynHQ#477 from chaynHQ/develop

8ce761e

Merge Develop onto Main

Merge pull request chaynHQ#480 from chaynHQ/develop

54f9181

Merge Develop onto Main

Merge pull request chaynHQ#482 from chaynHQ/develop

f50aeb9

Merge Develop onto Main

Merge pull request chaynHQ#493 from chaynHQ/develop

d7d0a0f

Merge Develop onto Main

Merge pull request chaynHQ#496 from chaynHQ/develop

2546082

Merge Develop onto Main

Merge pull request chaynHQ#497 from chaynHQ/develop

33c0f5d

Merge Develop onto Main

Merge pull request chaynHQ#504 from chaynHQ/develop

05cc216

Merge Develop onto Main

Merge pull request chaynHQ#506 from chaynHQ/develop

0224744

Merge Develop onto Main

Merge pull request chaynHQ#508 from chaynHQ/develop

f32b31e

Merge Develop onto Main

Merge pull request chaynHQ#513 from chaynHQ/develop

6e86e5e

Merge Develop onto Main

Merge pull request chaynHQ#518 from chaynHQ/develop

18608e0

Merge Develop onto Main

Merge pull request chaynHQ#527 from chaynHQ/develop

b82ebff

Merge Develop onto Main

Merge pull request chaynHQ#552 from chaynHQ/develop

f7c3d34

Merge Develop onto Main

Merge pull request chaynHQ#564 from chaynHQ/develop

b639486

Merge Develop onto Main

Merge pull request chaynHQ#582 from chaynHQ/develop

8d97ec6

Merge Develop onto Main

Merge remote-tracking branch 'upstream/main' into develop

6777cd4

Merge branch 'develop' of github.com:chaynHQ/bloom-backend into develop

707fc61

refactor: remove unnecessary joins in getUserByFirebaseId method

d59073d

reidn3r mentioned this pull request Sep 19, 2024

Remove unnecessary joins in getUserByFirebaseId method #633

Closed

eleanorreem self-assigned this Sep 20, 2024

Merge branch 'develop' into remove-unnecessary-joins-from-develop

fd0371e

eleanorreem closed this Oct 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove unnecessary joins from develop branch #645

Remove unnecessary joins from develop branch #645

reidn3r commented Sep 19, 2024

eleanorreem commented Sep 20, 2024

reidn3r commented Sep 20, 2024

kyleecodes commented Sep 22, 2024

reidn3r commented Sep 22, 2024

Remove unnecessary joins from develop branch #645

Remove unnecessary joins from develop branch #645

Conversation

reidn3r commented Sep 19, 2024

eleanorreem commented Sep 20, 2024

reidn3r commented Sep 20, 2024

kyleecodes commented Sep 22, 2024

reidn3r commented Sep 22, 2024