Fixing our build

.github/workflows/buildandtest.yml

@@ -0,0 +1,18 @@
+name: Build Docker Image 
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag find-a-doc-api:$(date +%s)

.github/workflows/deploy.yml

@@ -0,0 +1,18 @@
+name: Build Docker Image 
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag find-a-doc-api:$(date +%s)

.gitignore

@@ -14,7 +14,6 @@ yarn-error.log
 eslint-results.sarif
 
 # App specific
-src/typeDefs/gqlTypes.ts
 .env*
 !.env.sample
 !.env.dev

.nvmrc

@@ -1 +1 @@
-18.17.0
+20.5.1

.yarnrc.yml

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.5.1.cjs
+yarnPath: .yarn/releases/yarn-3.6.3.cjs

docker/api/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.17.1
+FROM node:20.5.1
 
 # Create app directore
 WORKDIR /usr/src/app

package.json

@@ -16,7 +16,9 @@
         "generate": "graphql-codegen --config ./src/typesgeneratorconfig.ts",
         "lint": "eslint . --ext .js,.ts,.json",
         "lint:check": "eslint . --ext .js,.ts,.json",
-        "lint:ci": "eslint . --ext .js,.ts,.json"
+        "lint:ci": "eslint . --ext .js,.ts,.json",
+        "preprod": "yarn generate",
+        "predev": "yarn generate"
     },
     "repository": {
         "type": "git",
@@ -32,11 +34,11 @@
     "homepage": "https://github.com/ourjapanlife/findadoc-server#readme",
     "devDependencies": {
         "@graphql-codegen/cli": "^5.0.0",
-        "@graphql-codegen/typescript": "^4.0.0",
-        "@graphql-codegen/typescript-resolvers": "^4.0.0",
+        "@graphql-codegen/typescript": "^4.0.1",
+        "@graphql-codegen/typescript-resolvers": "^4.0.1",
         "@jest/globals": "^29.6.2",
-        "@types/jest": "^29.5.3",
-        "@types/node": "^20.5.1",
+        "@types/jest": "^29.5.4",
+        "@types/node": "^20.5.7",
         "@types/supertest": "^2.0.12",
         "@typescript-eslint/eslint-plugin": "^5.30.7",
         "@typescript-eslint/parser": "^5.31.0",
@@ -46,26 +48,26 @@
         "eslint-config-airbnb-typescript": "^17.0.0",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-json": "^3.1.0",
-        "firebase-tools": "^12.0.0",
+        "firebase-tools": "^12.5.2",
         "husky": "^8.0.1",
-        "jest": "^29.6.2",
+        "jest": "^29.6.4",
         "ts-jest": "^29.1.1",
         "ts-node": "^10.9.1",
         "ts-node-dev": "^2.0.0",
-        "typescript": "^5.0.0"
+        "typescript": "^5.2.2"
     },
     "dependencies": {
-        "@apollo/server": "^4.3.2",
+        "@apollo/server": "^4.9.2",
         "@graphql-tools/mock": "^9.0.0",
         "@graphql-tools/schema": "^10.0.0",
         "csv-parse": "^5.3.3",
         "dotenv": "^16.3.1",
-        "firebase": "^10.0.0",
-        "firebase-admin": "^11.5.0",
-        "graphql": "^16.6.0",
+        "firebase": "^10.3.0",
+        "firebase-admin": "^11.10.1",
+        "graphql": "^16.8.0",
         "graphql-import-node": "^0.0.5",
         "graphql-tag": "^2.12.6",
-        "supertest": "^6.3.0"
+        "supertest": "^6.3.3"
     },
-    "packageManager": "yarn@3.5.1"
+    "packageManager": "yarn@3.6.3"
 }

src/databaseSeedTool.ts

@@ -1,13 +1,12 @@
-import { initializeDb } from './database'
 import { addHealthcareProfessional } from './services/healthcareProfessionalService'
 import { addFacility } from './services/facilityService'
 
-import { fakeHealthcareProfessionals } from './fakeData/healthcareProfessional'
+import { fakeHealthcareProfessionals } from './fakeData/healthcareProfessionals'
 import { fakeFacilities } from './fakeData/facilities'
 
 import { getFirestore } from 'firebase-admin/firestore'
 
-export const seedDatabase = () => {
+export const seedDatabase = async () => {
     const args = process.argv
 
     // initializeDb()
@@ -16,22 +15,16 @@ export const seedDatabase = () => {
 
     const healthcareProfessionals = fakeHealthcareProfessionals()
     const facilities = fakeFacilities()
-
+    
     const healthcareProfessionalForFacility = healthcareProfessionals[0]
-
-    facilities[0].healthcareProfessionals = [healthcareProfessionalForFacility]
 
-    async function test() {
-        // const hpRef = db.collection('healthcareProfessionals')
-
-        await healthcareProfessionals.forEach(hp => {
-            addHealthcareProfessional(hp)
-        })
+    facilities[0].healthcareProfessionals = [healthcareProfessionalForFacility]
 
-        const facilitiesRef = db.collection('facilities')
+    for await (const hp of healthcareProfessionals) {
+        await addHealthcareProfessional(hp)
+    }
 
-        await facilities.forEach(facility => {
-            addFacility(facility)
-        })
+    for await (const facility of facilities) {
+        await addFacility(facility)
     }
 }

src/fakeData/facilities.ts

@@ -0,0 +1,26 @@
+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]
+}

src/fakeData/healthcareProfessionals.ts

@@ -0,0 +1,80 @@
+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]
+}

src/services/facilityService.ts

@@ -25,7 +25,7 @@ export async function addFacility(input: gqlTypes.Facility) {
         && input.healthcareProfessionals !== undefined 
         && input.healthcareProfessionals.length > 0) {
         addHealthcareProfessional(
-            healthcareProfessionalRef, input.healthcareProfessionals[0] as gqlTypes.HealthcareProfessional
+            input.healthcareProfessionals[0] as gqlTypes.HealthcareProfessional, healthcareProfessionalRef
         )
     }
 

src/services/healthcareProfessionalService.ts

@@ -17,14 +17,17 @@ export async function getHealthcareProfessionalById(id: string) {
     return convertedEntity
 }
 
-export async function addHealthcareProfessional(
-    healthcareProfessionalRef: 
-    FirebaseFirestore.DocumentReference<firebase.DocumentData>, 
-    input: typeDefs.HealthcareProfessional
+export async function addHealthcareProfessional( 
+    input: typeDefs.HealthcareProfessional, healthcareProfessionalRef: 
+    FirebaseFirestore.DocumentReference<firebase.DocumentData>
 ) {
+    if (!healthcareProfessionalRef) {
+        healthcareProfessionalRef = db.collection('healthcareProfessionals').doc()
+    }
+
     const newHealthcareProfessional = {
         id: healthcareProfessionalRef.id, 
-        acceptedInsurance: mapAndValidateInsurance(input.acceptedInsurance as []),
+        acceptedInsurance: mapAndValidateInsurance(input.acceptedInsurance as typeDefs.Insurance[]),
         degrees: mapAndValidateDegrees(input.degrees as typeDefs.Degree[]),
         names: mapAndValidateNames(input.names as typeDefs.LocaleName[]),
         specialties: mapAndValidateSpecialties(input.specialties as typeDefs.Specialty[]),