Fixing our build #239

ermish · 2023-08-28T08:00:33Z

Resolves #235
Resolves #236
Resolves #237
Resolves #238

#This PR fixes the current production build

What changed

Fixed the build which required many prerequisite fixes listed above.
This is a first step towards getting our CI/CD pipeline up and running!
The fake data and changes in services aren't perfect. It's just a starting point 😄 feel free to update
updated yarn to the latest version.

Testing instructions

run yarn prod:build and see no errors

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Philip Ermish <[email protected]>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: LaShawn Toyoda <[email protected]>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix: add firebase service account key to env variable Prior to this change, a new developer starting server would get an error message saying private key is missing. Installed dotenv to handle environment variables in the code. Updated README with instructions on how to get a private key from firebase and how to add it to the local env file. * docs: Add instructions for setting up Firebase Service Account

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

The reason for this change is to allow users to submit incomplete information to be reviewed by moderators prior to being searchable on the website

* feat: implement mutation for addFacility * feat: implement mutation for addHealthcareProfessional * refactor: fix healthcareProfessionalService types * refactor: fix types and move function

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Co-authored-by: Philip Ermish <[email protected]>

* chore: update healthcareProfessional service * feat: add new Facility with HealthcareProfessional Ids * refactor: clean up imports * feat: add the isDeleted field to Facility and HealthcareProfessional

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: LaShawn Toyoda <[email protected]>

) Previously there were no service functions to allow users to get, add, or update submissions. There are now functions to perform these tasks. There is now also a Submission type alias in TypeDefs/dbschema.ts

)

* feat: implement end-to-end testing with Jest and Supertest Prior to this commit the tests that were in place were legacy tests for when our tech stack included Prisma and Postgres. Now that we're using Firestore they're no longer needed. * feat: add GitHub action to run tests * feat: add mock firebase config for jest Co-authored-by: Anissa Chadouli [email protected] * docs: update testing instructions * test: happy path is successful * refactor: separate env variables for dev and prod Co-authored-by: Philip Ermish <[email protected]> * chore: fix docker in github actions Co-authored-by: Philip Ermish <[email protected]> * chore: fix docker in github actions Co-authored-by: Philip Ermish <[email protected]> * chore: fix yarn path Co-authored-by: Philip Ermish <[email protected]> * chore: check in dev and prod env Co-authored-by: Philip Ermish <[email protected]> * Update README.md * Update __tests__/server.test.ts * Update src/index.ts --------- Co-authored-by: Philip Ermish <[email protected]>

socket-security · 2023-08-28T09:28:28Z

Removed dependencies detected. Learn more about Socket for GitHub ↗︎

🚮 Removed packages: @apollo/[email protected], @types/[email protected], [email protected], [email protected], [email protected], [email protected]

theyokohamalife · 2023-08-28T10:33:00Z

@ermish When I run try to run yarn install or yarn prod:build it gives the following error. This is with node 20.5.1.

YAMLException: bad indentation of a mapping entry at line 366, column 23:
        "@babel/highlight": ^7.22.5
                          ^
        "@babel/highlight": ^7.22.5
                          ^

theyokohamalife

Off to a good start! ✨ Let's separate these into different PRs since they address very different issues. Also, let's make sure that the fake data is correct before merging. We have more active members in the repo now with various skill levels and we want to make sure that everything that gets merged into main is functional.

theyokohamalife · 2023-08-28T10:41:02Z

Also, you might want to rebase because it's showing 33 commits.

theyokohamalife · 2023-08-28T10:42:04Z

@ermish Don't forget to include descriptive PR titles.

theyokohamalife · 2023-08-28T10:50:54Z

src/fakeData/facilities.ts

+import { Facility } from '../typeDefs/gqlTypes'
+
+export const fakeFacilities = () => {
+    const facility : Facility = {
+        nameEn: 'Zoo',
+        nameJa: '動物園',
+        contact: {
+            address: {
+                // generate fake data from type PhysicalAddress in gqlTypes.ts file
+                addressLine1En: '1-1-1',
+                addressLine2En: 'Ueno',
+                cityEn: 'Taito',
+                prefectureEn: 'Tokyo',
+                postalCode: '100-0000'            
+            },
+            email: '[email protected]',
+            phone: '08000000000',
+            website: 'https://zoo.test.com',
+            mapsLink: ''
+        },
+        healthcareProfessionalIds: [],
+        healthcareProfessionals: []
+    }
+
+    return [facility]
+}


This file was removed in #227 because it wasn't being used. Is there a reason we need to reintroduce the fake data?

yes, we want fake data.

this will be used for when we want to test endpoints by adding data, updating it, then deleting it.

we will also want seed data for when we load up a fake/test database so the site isn't empty.

Keep in mind this is just a starting point and we'll need to update this iteratively.

theyokohamalife · 2023-08-28T10:51:13Z

src/fakeData/healthcareProfessionals.ts

+import { HealthcareProfessional, Locale, LocaleName, Degree, 
+    Specialty, SpecialtyName, SpokenLanguage, Insurance } from '../typeDefs/gqlTypes'
+
+export const fakeHealthcareProfessionals = () => {
+    const doctorDoctor : LocaleName = {
+        lastName: 'Doctor',
+        firstName: 'Doctor',
+        middleName: 'MD',
+        locale: Locale.English
+    }
+    const medicalDegree : Degree = {
+        nameJa: 'メヂカル',
+        nameEn: 'Medical',
+        abbreviation: 'MD'
+    }
+
+    const japanese : SpokenLanguage = {
+        iso639_3: 'ja',
+        nameJa: '日本語',
+        nameEn: 'Japanese',
+        nameNative: 'Japanese'
+    }
+
+    const neurologyEn : SpecialtyName = {
+        name: 'Neurology',
+        locale: Locale.English
+    }
+
+    const neurology : Specialty = {
+        names: [neurologyEn]
+    }
+
+    const healthcareProfessionalOne : HealthcareProfessional = {
+        names: [doctorDoctor],
+        degrees: [medicalDegree],
+        spokenLanguages: [japanese],
+        specialties: [neurology],
+        acceptedInsurance: [Insurance.InternationalHealthInsurance],
+        isDeleted: false
+    }
+
+    const name : LocaleName = {
+        lastName: 'チェ',
+        firstName: 'ジェイコブ',
+        middleName: 'ベイヤード',
+        locale: Locale.Japanese
+    }
+    const englishDegree : Degree = {
+        nameJa: '英語',
+        nameEn: 'English',
+        abbreviation: 'En'
+    }
+
+    const english : SpokenLanguage = {
+        iso639_3: 'en-US',
+        nameJa: '英語',
+        nameEn: 'English',
+        nameNative: 'English'
+    }
+
+    const specialtyName : SpecialtyName = {
+        name: 'Pandas',
+        locale: Locale.English
+    }
+
+    const pandaSpecialty : Specialty = {
+        names: [specialtyName]
+    }
+
+    const healthcareProfessionalTwo : HealthcareProfessional = {
+        names: [name],
+        degrees: [englishDegree],
+        spokenLanguages: [english],
+        specialties: [pandaSpecialty],
+        acceptedInsurance: [Insurance.InternationalHealthInsurance],
+        isDeleted: false
+    }
+
+    return [healthcareProfessionalOne, healthcareProfessionalTwo]
+}


This file was also removed in #227

yeah, I realized that we removed it. We shouldn't have 😅

@ermish I asked this in the issue, but I'll ask it again here. What can this fake data do that auto-mocking from the schema can't? It seems like extra work to manually seed the db with files that will have to be updated and maintained.

answered in the previous comment:

yes, we want fake data.
this will be used for when we want to test endpoints by adding data, updating it, then deleting it.
we will also want seed data for when we load up a fake/test database so the site isn't empty.
Keep in mind this is just a starting point and we'll need to update this iteratively.

theyokohamalife · 2023-08-28T10:57:02Z

src/databaseSeedTool.ts

 import { addHealthcareProfessional } from './services/healthcareProfessionalService'
 import { addFacility } from './services/facilityService'

-import { fakeHealthcareProfessionals } from './fakeData/healthcareProfessional'
+import { fakeHealthcareProfessionals } from './fakeData/healthcareProfessionals'


I think it's better to use mock data that's autogenerated instead of seed files that will have to be updated and maintained when schema changes are made. What are your thoughts?

for tests, yes, but we're likely going to want initial seed data to have the site functional beyond testing a single endpoint. So basically, we'll want both.

Perhaps we should use real examples then?

that's what these are 😆

ermish · 2023-08-28T12:46:06Z

Off to a good start! ✨ Let's separate these into different PRs since they address very different issues. Also, let's make sure that the fake data is correct before merging. We have more active members in the repo now with various skill levels and we want to make sure that everything that gets merged into main is functional.

I'd like to keep it together as these were the changes needed to get the build working. The only part that is extra is the package updates, but it's part of my work to get the build working with up to date packages

ermish · 2023-08-28T12:47:33Z

Also, you might want to rebase because it's showing 33 commits.

yup! I might put this in draft as it was working, but I rebased and have to fix it again. I'll ping you when it's actually ready to be tested.

ermish · 2023-08-28T13:04:51Z

ok @theyokohamalife, build works again! please check

theyokohamalife · 2023-08-28T13:20:54Z

ok @theyokohamalife, build works again! please check

@ermish I get the following error after your latest commit:

ermish · 2023-08-28T13:39:50Z

ok @theyokohamalife, build works again! please check

@ermish I get the following error after your latest commit:

hmmm I don't think you have the latest commit. It fixes that. 🤔

theyokohamalife · 2023-08-28T23:29:10Z

hmmm I don't think you have the latest commit. It fixes that. 🤔

@ermish You're right. Just pulled again and it built without errors. 👍🏾

I think this is good to go after you get CI to pass.

ermish · 2023-08-29T04:25:34Z

hmmm I don't think you have the latest commit. It fixes that. 🤔

@ermish You're right. Just pulled again and it built without errors. 👍🏾

I think this is good to go after you get CI to pass.

CI Passed! It's just the in progress workflows that are failing. I can comment them out I guess to have it pass

ermish · 2023-08-29T04:57:50Z

ok @theyokohamalife it's ready, please approve!

theyokohamalife

LGTM! Nice work!

ermish and others added 30 commits April 28, 2023 13:39

progress

e2a1f88

fix(deps): update dependency firebase-admin to v11.6.0 (#182)

b9492e1

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

got build and queries working again! (#181)

6680f48

fix(deps): update dependency csv-parse to v5.3.8 (#183)

d6fcc80

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Philip Ermish <[email protected]>

chore(deps): update yarn to v3.5.1 (#190)

8958a59

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Philip Ermish <[email protected]>

fix(deps): update dependency @apollo/server to v4.7.0 (#185)

810a0c8

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

chore(deps): update dependency eslint to v8.40.0 (#179)

3b5d481

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: LaShawn Toyoda <[email protected]>

chore(deps): update dependency firebase-tools to v11.28.0 (#184)

80ed2ca

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: LaShawn Toyoda <[email protected]>

fix(deps): update dependency firebase to v9.22.0 (#186)

49a2d44

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: LaShawn Toyoda <[email protected]>

chore(deps): update typescript-eslint monorepo to v5.62.0 (#187)

7ee4576

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

chore(deps): update dependency @types/chai to v4.3.5 (#188)

4f5fe68

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

chore(deps): update dependency all-contributors-cli to v6.26.1 (#189)

cec108d

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

fix(deps): update dependency csv-parse to v5.4.0 (#193)

0acee55

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

chore(deps): update graphqlcodegenerator monorepo to v4 (#194)

f51ef65

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

chore(deps): update dependency node to v18.17.0 (#197)

5a53afe

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

fix(deps): update dependency firebase to v10 (#210)

191a7b6

chore(deps): update dependency firebase-tools to v12 (#192)

41762c7

feat: add Submission type and input (#208)

d938aa2

The reason for this change is to allow users to submit incomplete information to be reviewed by moderators prior to being searchable on the website

feat: add mutations for addFacility and addHealthcareProfessional (#203)

515d8d2

* feat: implement mutation for addFacility * feat: implement mutation for addHealthcareProfessional * refactor: fix healthcareProfessionalService types * refactor: fix types and move function

chore(deps): update reviewdog/action-eslint action to v1.19.2 (#205)

9c839a7

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Remove codeowners until the repo goes public (#228)

3ab1233

chore: set renovate confidence to high (#215)

06575b0

Co-authored-by: Philip Ermish <[email protected]>

Refactor FacilityService and HealthcareProfessionalService (#223)

177be29

* chore: update healthcareProfessional service * feat: add new Facility with HealthcareProfessional Ids * refactor: clean up imports * feat: add the isDeleted field to Facility and HealthcareProfessional

chore(deps): update node.js to v18.17.1 (#216)

de67a48

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: LaShawn Toyoda <[email protected]>

chore(deps): update dependency @graphql-codegen/cli to v5 (#217)

d04eb6e

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: LaShawn Toyoda <[email protected]>

👥 Add @evan-desu as a contributor (#231)

14d0bfa

feat: add a submissionService file and Submission type definitions (#213

9456f3e

) Previously there were no service functions to allow users to get, add, or update submissions. There are now functions to perform these tasks. There is now also a Submission type alias in TypeDefs/dbschema.ts

feat: add a submissionService file and Submission type definitions (#218

07d27a0

)

got build working!

4b9186b

ermish added the enhancement New feature or request label Aug 28, 2023

ermish self-assigned this Aug 28, 2023

Merge branch 'main' into ermish/cicd

407c64b

theyokohamalife self-requested a review August 28, 2023 10:29

theyokohamalife requested changes Aug 28, 2023

View reviewed changes

theyokohamalife reviewed Aug 28, 2023

View reviewed changes

ermish changed the title ~~Ermish/cicd~~ Fixing our build Aug 28, 2023

theyokohamalife marked this pull request as draft August 28, 2023 13:01

merge fixes. build works again

e8f3ee7

commenting out in progress workflows

5281252

ermish marked this pull request as ready for review August 29, 2023 04:57

theyokohamalife self-requested a review August 29, 2023 06:47

theyokohamalife approved these changes Aug 29, 2023

View reviewed changes

theyokohamalife merged commit 99576b1 into main Aug 29, 2023
6 checks passed

theyokohamalife deleted the ermish/cicd branch August 29, 2023 06:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixing our build #239

Fixing our build #239

ermish commented Aug 28, 2023 •

edited

Loading

socket-security bot commented Aug 28, 2023

theyokohamalife commented Aug 28, 2023 •

edited

Loading

theyokohamalife left a comment

theyokohamalife commented Aug 28, 2023

theyokohamalife commented Aug 28, 2023

theyokohamalife Aug 28, 2023

ermish Aug 28, 2023

theyokohamalife Aug 28, 2023

ermish Aug 28, 2023

theyokohamalife Aug 28, 2023

ermish Aug 29, 2023

theyokohamalife Aug 28, 2023 •

edited

Loading

ermish Aug 28, 2023

theyokohamalife Aug 28, 2023

ermish Aug 29, 2023

ermish commented Aug 28, 2023

ermish commented Aug 28, 2023

ermish commented Aug 28, 2023

theyokohamalife commented Aug 28, 2023

ermish commented Aug 28, 2023

theyokohamalife commented Aug 28, 2023 •

edited

Loading

ermish commented Aug 29, 2023

ermish commented Aug 29, 2023

theyokohamalife left a comment

Fixing our build #239

Fixing our build #239

Conversation

ermish commented Aug 28, 2023 • edited Loading

What changed

Testing instructions

socket-security bot commented Aug 28, 2023

theyokohamalife commented Aug 28, 2023 • edited Loading

theyokohamalife left a comment

Choose a reason for hiding this comment

theyokohamalife commented Aug 28, 2023

theyokohamalife commented Aug 28, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

theyokohamalife Aug 28, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ermish commented Aug 28, 2023

ermish commented Aug 28, 2023

ermish commented Aug 28, 2023

theyokohamalife commented Aug 28, 2023

ermish commented Aug 28, 2023

theyokohamalife commented Aug 28, 2023 • edited Loading

ermish commented Aug 29, 2023

ermish commented Aug 29, 2023

theyokohamalife left a comment

Choose a reason for hiding this comment

ermish commented Aug 28, 2023 •

edited

Loading

theyokohamalife commented Aug 28, 2023 •

edited

Loading

theyokohamalife Aug 28, 2023 •

edited

Loading

theyokohamalife commented Aug 28, 2023 •

edited

Loading