Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: merge prisma backend #664

Merged
merged 621 commits into from
Feb 21, 2024
Merged

feat: merge prisma backend #664

merged 621 commits into from
Feb 21, 2024

Conversation

ludtkemorgan
Copy link
Collaborator

@ludtkemorgan ludtkemorgan commented Feb 17, 2024

Pull Prisma changes over to HBA

  • This change addresses the issue in full
  • This change addresses only certain aspects of the issue
  • This change is a dependency for another issue
  • This change has a dependency from another issue

Description

This pulls all of the changes from core into HBA. A majority of this is the Prisma changes, but there are a few changes that are in core and not yet here.

Because of the way the commits are in main from the prisma merge I was unable to cherry-pick. Instead I did a merge from core. This means that git thinks there are commits going back almost 2 years that are a part of this change. So ignore the commits, but rather the actual changes.

Note:

  • There was well over 200 files that had merge conflicts and I did my best to look for anything that might be weird. There was a few places that differ from Core and I kept those how they were in HBA.

How Can This Be Tested/Reviewed?

Both the partner and public sites should work e2e using the new backend.

Checklist:

  • My code follows the style guidelines of this project
  • I have added QA notes to the issue with applicable URLs
  • I have performed a self-review of my own code
  • I have reviewed the changes in a desktop view
  • I have reviewed the changes in a mobile view
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have assigned reviewers
  • I have run yarn generate:client and/or created a migration if I made backend changes that require them
  • My commit message(s) is/are polished, and any breaking changes are indicated in the message and are well-described
  • Commits made across packages purposefully have the same commit message/version change, else are separated into different commits

Reviewer Notes:

Steps to review a PR:

  • Read and understand the issue, and ensure the author has added QA notes
  • Review the code itself from a style point of view
  • Pull the changes down locally and test that the acceptance criteria is met
  • Also review the acceptance criteria on the Netlify deploy preview (noting that these do not yet include any backend changes made in the PR)
  • Either explicitly ask a clarifying question, request changes, or approve the PR if there are small remaining changes but the PR is otherwise good to go

On Merge:

If you have one commit and message, squash. If you need each message to be applied, rebase and merge.

lisunshiny and others added 30 commits February 7, 2023 11:23
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
* chore: update the token usage in the Next.js apps

* chore: additional token updates

* chore: additional token updates

* chore: Update to latest ui-components release

* chore: update uic in shared-helpers too

* chore: move some components to shared helpers

* fix: TypeScript errors

* fix: additional TS errors

* chore: remove a couple of any typings

* fix: cast unknown type to string
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
* test: add unit tests on the ListingView component

* chore: make date variables consistent

* test: remove afterEach line
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
…g#3257)

Bumps [class-validator](https://github.com/typestack/class-validator) from 0.12.2 to 0.14.0.
- [Release notes](https://github.com/typestack/class-validator/releases)
- [Changelog](https://github.com/typestack/class-validator/blob/develop/CHANGELOG.md)
- [Commits](typestack/class-validator@v0.12.2...v0.14.0)

---
updated-dependencies:
- dependency-name: class-validator
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
* feat: upgrade to node 19 and next 12

* fix: add netlify plugin

* fix: add netlify plugin partners

* fix: remove netlify plugins

* fix: add netlify plugin to toml

* Revert "fix: remove netlify plugins"

This reverts commit 840b4a1.

* fix: switch to node 16

* fix: update all places referencing node

* Revert "fix: update all places referencing node"

This reverts commit 9f13a5a.

* Revert "fix: switch to node 16"

This reverts commit 8acbfbe.

* fix: re-installed with 18
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
* feat: add user csv export

* fix: remove test logic from auth context

* fix: change dates to add time

* fix: add success message and more tests

* fix: remove only from test file
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
* fix: user export fixes

* fix: update error message alert
* feat: upgrade react to 18

* feat: upgrade cypress to 12 for public

* feat: upgrade cypress for partners

* fix: update configs

* fix: update partner cypress tests

* fix: review comments

* fix: fix flaky cypress test
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
* fix: program/preference keys length uncap

* fix: updates per pr comments
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
* feat: upgrade nextjs to 13

* fix: attempt to get cypress test working
Copy link
Collaborator

@YazeedLoonat YazeedLoonat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fantastic!
Only thing I found was:
the user export seems to have a problem where it both doesn't download in the web browser and also doesn't actually send an email out

@ludtkemorgan
Copy link
Collaborator Author

@YazeedLoonat The email of the user export should be working. Are you logged in with an account to your email and not the admin account?

* feat: external listing endpoint

* fix: adding some tests (temp endpoint so quick tests)

* fix: update per morgan

const ApplicationPreferencesAll = () => {
const { listing } = useFormConductor("preferences")
const { listing } = useFormConductor("preferencesAll")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you know where this change is coming from?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm trying to get the cypress tests to pass and this was a theory since I get a warning about "There is no step defined which matches preferences". That did not solve the issue of running the cypress tests in ci so I'll remove it. But it is a warning that we might want to address at some point.

For the cypress issue. It appears that for some reason only one of the two address verification steps is happening on circleCi when both of them happen when running locally. And they work correctly in Core. So still digging into it

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, I reverted this change and I got the cypress public test working. I don't know why it was working locally but it was an issue with additional data in the application data for the cypress test.

@ludtkemorgan ludtkemorgan force-pushed the release/2024-02-17 branch 2 times, most recently from 65100f5 to 573f2c8 Compare February 20, 2024 23:58
@ColinBuyck
Copy link
Collaborator

ColinBuyck commented Feb 21, 2024

I recognize that this is happening in Core as well but I'm just noticing that export files are saved on the backend. Is that temp folder automatically deleted at some point? Are there any concerns with doing this with production-level usage?
Screenshot 2024-02-20 at 5 29 29 PM

@YazeedLoonat
Copy link
Collaborator

YazeedLoonat commented Feb 21, 2024

@ColinBuyck

I recognize that this is happening in Core as well but I'm just noticing that export files are saved on the backend. Is that temp folder automatically deleted at some point? Are there any concerns with doing this with production-level usage? Screenshot 2024-02-20 at 5 29 29 PM

Hello! we have a cronjob that runs every so often that will clear that folder of all data

we were running into collisions with the testing which indicated that deleting the files immediately could cause issues on production which files being deleted before they were sent

@YazeedLoonat YazeedLoonat self-requested a review February 21, 2024 16:14
Copy link
Collaborator

@YazeedLoonat YazeedLoonat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @ludtkemorgan :sigh: I created a user for myself then forgot to use that user

whoever own [email protected] got a whole bunch of user exports lol

giving this the approval from me

Copy link
Collaborator

@ColinBuyck ColinBuyck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🕹️ Thanks for the clarification @YazeedLoonat!

@ludtkemorgan ludtkemorgan merged commit fcca33e into main Feb 21, 2024
45 checks passed
@ludtkemorgan ludtkemorgan temporarily deployed to hba-0-3-alameda-staging February 21, 2024 19:43 Inactive
@ludtkemorgan ludtkemorgan had a problem deploying to hba-0-3-alameda-staging February 21, 2024 19:49 Failure
@ludtkemorgan ludtkemorgan temporarily deployed to hba-0-3-alameda-staging February 21, 2024 19:51 Inactive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

10 participants