fix: PR comments

island-is · Sep 6, 2024 · bef6497 · bef6497
1 parent bebd4d9
commit bef6497
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 26 deletions.
diff --git a/libs/api/domains/health-directorate/src/lib/health-directorate.resolver.ts b/libs/api/domains/health-directorate/src/lib/health-directorate.resolver.ts
@@ -32,7 +32,7 @@ export class HealthDirectorateResolver {
 
   /* Organ Donation */
   @Query(() => OrganDonation, {
-    name: 'HealthDirectorateOrganDonation',
+    name: 'healthDirectorateOrganDonation',
   })
   @Audit()
   async getDonorStatus(
@@ -55,7 +55,7 @@ export class HealthDirectorateResolver {
 
   @Mutation(() => Boolean, {
     nullable: true,
-    name: 'HealthDirectorateOrganDonationUpdateDonorStatus',
+    name: 'healthDirectorateOrganDonationUpdateDonorStatus',
   })
   @Audit()
   async updateDonorStatus(
@@ -67,7 +67,7 @@ export class HealthDirectorateResolver {
 
   /* Vaccinations */
   @Query(() => Vaccinations, {
-    name: 'HealthDirectorateVaccinations',
+    name: 'healthDirectorateVaccinations',
   })
   @Audit()
   getVaccinations(@CurrentUser() user: User): Promise<Vaccinations> {

diff --git a/libs/api/domains/health-directorate/src/lib/models/vaccinations.model.ts b/libs/api/domains/health-directorate/src/lib/models/vaccinations.model.ts
@@ -1,22 +1,22 @@
 import { DiseaseVaccinationDtoVaccinationStatusEnum } from '@island.is/clients/health-directorate'
-import { Field, ObjectType, registerEnumType } from '@nestjs/graphql'
+import { Field, Int, ObjectType, registerEnumType } from '@nestjs/graphql'
 
 registerEnumType(DiseaseVaccinationDtoVaccinationStatusEnum, {
   name: 'HealthDirectorateVaccinationsStatus',
 })
 
 @ObjectType('HealthDirectorateVaccinationsAge')
 export class Age {
-  @Field(() => Number, { nullable: true })
+  @Field(() => Int, { nullable: true })
   years?: number
 
-  @Field(() => Number, { nullable: true })
+  @Field(() => Int, { nullable: true })
   months?: number
 }
 
 @ObjectType('HealthDirectorateVaccinationsInfo')
 export class Info {
-  @Field(() => Number)
+  @Field(() => Int)
   id!: number
 
   @Field({ nullable: true })

diff --git a/libs/clients/health-directorate/src/lib/clients/organ-donation/organDonation.service.ts b/libs/clients/health-directorate/src/lib/clients/organ-donation/organDonation.service.ts
@@ -47,15 +47,11 @@ export class HealthDirectorateOrganDonationService {
     auth: Auth,
     input: UpdateOrganDonorDto,
   ): Promise<void> {
-    await this.organDonationApiWithAuth(auth)
-      .meDonorStatusControllerUpdateOrganDonorStatus({
-        updateOrganDonorDto: input,
-      })
-      .catch((error: Error) => {
-        throw new Error(
-          `health-directorate-organ-donation-client: update organ donation status failed ${error.message}`,
-        )
-      })
+    await this.organDonationApiWithAuth(
+      auth,
+    ).meDonorStatusControllerUpdateOrganDonorStatus({
+      updateOrganDonorDto: input,
+    })
   }
 
   public async getDonationExceptions(

diff --git a/libs/service-portal/health/src/screens/OrganDonation/OrganDonation.graphql b/libs/service-portal/health/src/screens/OrganDonation/OrganDonation.graphql
@@ -1,5 +1,5 @@
 query getDonorStatus($locale: String) {
-  HealthDirectorateOrganDonation(locale: $locale) {
+  healthDirectorateOrganDonation(locale: $locale) {
     donor {
       isDonor
       limitations {
@@ -15,7 +15,7 @@ query getDonorStatus($locale: String) {
 }
 
 query getOrgansList($locale: String) {
-  HealthDirectorateOrganDonation(locale: $locale) {
+  healthDirectorateOrganDonation(locale: $locale) {
     donor {
       isDonor
       limitations {
@@ -34,5 +34,5 @@ query getOrgansList($locale: String) {
 }
 
 mutation updateOrganDonationInfo($input: HealthDirectorateOrganDonorInput!) {
-  HealthDirectorateOrganDonationUpdateDonorStatus(input: $input)
+  healthDirectorateOrganDonationUpdateDonorStatus(input: $input)
 }
diff --git a/libs/service-portal/health/src/screens/OrganDonation/OrganDonation.tsx b/libs/service-portal/health/src/screens/OrganDonation/OrganDonation.tsx
@@ -18,7 +18,7 @@ const OrganDonation = () => {
   const { data, loading, error } = useGetDonorStatusQuery({
     fetchPolicy: 'no-cache',
   })
-  const donorStatus = data?.HealthDirectorateOrganDonation.donor
+  const donorStatus = data?.healthDirectorateOrganDonation.donor
   const cardText: string = donorStatus?.isDonor
     ? donorStatus?.limitations?.hasLimitations
       ? [

diff --git a/libs/service-portal/health/src/screens/OrganDonationRegistration/RegistrationForm.tsx b/libs/service-portal/health/src/screens/OrganDonationRegistration/RegistrationForm.tsx
@@ -39,12 +39,12 @@ export const Form2 = () => {
     variables: { locale: lang },
   })
 
-  const isDonor = data?.HealthDirectorateOrganDonation.donor?.isDonor
+  const isDonor = data?.healthDirectorateOrganDonation.donor?.isDonor
   const hasLimitations =
-    data?.HealthDirectorateOrganDonation.donor?.limitations?.hasLimitations
-  const allLimitations = data?.HealthDirectorateOrganDonation.organList
+    data?.healthDirectorateOrganDonation.donor?.limitations?.hasLimitations
+  const allLimitations = data?.healthDirectorateOrganDonation.organList
   const selectedLimitations =
-    data?.HealthDirectorateOrganDonation.donor?.limitations?.limitedOrgansList?.map(
+    data?.healthDirectorateOrganDonation.donor?.limitations?.limitedOrgansList?.map(
       (item) => item.id,
     )
   const donorStatus = isDonor

diff --git a/libs/service-portal/health/src/screens/Vaccinations/Vaccinations.graphql b/libs/service-portal/health/src/screens/Vaccinations/Vaccinations.graphql
@@ -1,5 +1,5 @@
 query getVaccinations {
-  HealthDirectorateVaccinations {
+  healthDirectorateVaccinations {
     vaccinations {
       id
       name

diff --git a/libs/service-portal/health/src/screens/Vaccinations/VaccinationsWrapper.tsx b/libs/service-portal/health/src/screens/Vaccinations/VaccinationsWrapper.tsx
@@ -18,7 +18,7 @@ export const VaccinationsWrapper = () => {
   const { formatMessage } = useLocale()
   const { data, loading, error } = useGetVaccinationsQuery()
 
-  const vaccinations = data?.HealthDirectorateVaccinations.vaccinations
+  const vaccinations = data?.healthDirectorateVaccinations.vaccinations
 
   const general = vaccinations?.filter((x) => x.isFeatured)
   const other = vaccinations?.filter((x) => !x.isFeatured)