feat(bulk-mileage): update errors (#16720)

* fix: display latest reg * feat: add error code map * feat: add errors * fix: csv parse * fix: jobs sorting * fix: remove strip * fix: translations * fix: add sanitization on number * fix: sanitization * fix: add secret from aws paramter store * fix: sanitize bit less powerfully * fix: more handling * Update libs/service-portal/assets/src/screens/VehicleBulkMileageUpload/VehicleBulkMileageUpload.tsx Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fix: coderabbit suggestions --------- Co-authored-by: Ásdís Erna Guðmundsdóttir <disa@hugsmidjan.is> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Nov 12, 2024 · c619e51 · c619e51
1 parent 4ef1c4c
commit c619e51
Show file tree

Hide file tree

Showing 18 changed files with 382 additions and 160 deletions.
diff --git a/libs/api/domains/vehicles/project.json b/libs/api/domains/vehicles/project.json
@@ -14,6 +14,12 @@
       "options": {
         "jestConfig": "libs/api/domains/vehicles/jest.config.ts"
       }
+    },
+    "extract-strings": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/api/domains/vehicles/src/lib/messages.ts'"
+      }
     }
   }
 }
diff --git a/libs/api/domains/vehicles/src/lib/dto/getBulkVehicleMileageRequestOverview.input.ts b/libs/api/domains/vehicles/src/lib/dto/getBulkVehicleMileageRequestOverview.input.ts
@@ -1,7 +1,11 @@
 import { Field, ID, InputType } from '@nestjs/graphql'
+import type { Locale } from '@island.is/shared/types'
 
 @InputType()
 export class BulkVehicleMileageRequestOverviewInput {
+  @Field(() => String)
+  locale!: Locale
+
   @Field(() => ID)
   guid!: string
 }
diff --git a/libs/api/domains/vehicles/src/lib/messages.ts b/libs/api/domains/vehicles/src/lib/messages.ts
@@ -0,0 +1,83 @@
+import { defineMessages } from 'react-intl'
+
+export const m = defineMessages({
+  tooManyPermno: {
+    id: 'api.bulk-vehicle-mileage:too-many-permno',
+    defaultMessage: 'Sama fastanúmer birtist oft í skjali',
+  },
+  missingPermno: {
+    id: 'api.bulk-vehicle-mileage:missing-permno',
+    defaultMessage: 'Fastanúmer vantar',
+  },
+  dateMissing: {
+    id: 'api.bulk-vehicle-mileage:date-missing',
+    defaultMessage: 'Dagsetning álesturs vantar',
+  },
+  originMissing: {
+    id: 'api.bulk-vehicle-mileage:missing-origin',
+    defaultMessage: 'Uppruna álesturs vantar',
+  },
+  mileageMissing: {
+    id: 'api.bulk-vehicle-mileage:missing-mileage',
+    defaultMessage: 'Álestur vantar',
+  },
+  mileageTooLow: {
+    id: 'api.bulk-vehicle-mileage:mileage-too-low',
+    defaultMessage: 'Km staða getur ekki verið minna en 0',
+  },
+  mileageLowerThanBefore: {
+    id: 'api.bulk-vehicle-mileage:mileage-lower-than-before',
+    defaultMessage:
+      'Km staða álesturs getur ekki verið minni en síðasta gildi sem skráð hefur verið á ökutækið',
+  },
+  originNotFound: {
+    id: 'api.bulk-vehicle-mileage:origin-not-found',
+    defaultMessage: 'Staðartegund í álestri finnst ekki',
+  },
+  carNotFound: {
+    id: 'api.bulk-vehicle-mileage:car-not-found',
+    defaultMessage: 'Ökutæki finnst ekki',
+  },
+  dateTooEarly: {
+    id: 'api.bulk-vehicle-mileage:date-too-early',
+    defaultMessage: 'Dagsetning færslu minni en nýjasta færsla á ökutæki',
+  },
+  invalidUpdate: {
+    id: 'api.bulk-vehicle-mileage:invalid-update',
+    defaultMessage: 'Ekki má breyta færslu sem er ekki innan dagsins í dag',
+  },
+  registerTooEarly: {
+    id: 'api.bulk-vehicle-mileage:register-too-early',
+    defaultMessage:
+      'Villa við skráningu, ekki má skrá innan 30 daga frá síðustu færslu',
+  },
+  forbiddenUpdate: {
+    id: 'api.bulk-vehicle-mileage:forbidden-update',
+    defaultMessage: 'Ekki má breyta færslu sem er ekki nýjasta færsla ökutækis',
+  },
+  unauthorizedUpdater: {
+    id: 'api.bulk-vehicle-mileage:unauthorized-updater',
+    defaultMessage:
+      'Tilkynnandi eða innsendur tilkynnandi er hvorki umráðamaður né eigandi ökutækis',
+  },
+  invalidMileage: {
+    id: 'api.bulk-vehicle-mileage:invalid-mileage',
+    defaultMessage: 'Tegund álesturs ekki til',
+  },
+  invalidDelete: {
+    id: 'api.bulk-vehicle-mileage:invalid-delete',
+    defaultMessage: 'Aðeins er leyfilegt að eyða nýjustu km skráningu',
+  },
+  notFoundDelete: {
+    id: 'api.bulk-vehicle-mileage:not-found-delete',
+    defaultMessage: 'Færsla til að eyða finnst ekki',
+  },
+  unnecessaryRegistration: {
+    id: 'api.bulk-vehicle-mileage:unnecessary-registration',
+    defaultMessage: 'Ökutæki krefst ekki aflesturs',
+  },
+  tooHighMileage: {
+    id: 'api.bulk-vehicle-mileage:too-high-mileage',
+    defaultMessage: 'Km staða fer yfir hámark per dag',
+  },
+})
diff --git a/...mains/vehicles/src/lib/models/v3/bulkMileage/bulkMileageRegistrationRequestError.model.ts b/...mains/vehicles/src/lib/models/v3/bulkMileage/bulkMileageRegistrationRequestError.model.ts
@@ -1,4 +1,4 @@
-import { Field, ObjectType } from '@nestjs/graphql'
+import { Field, Int, ObjectType } from '@nestjs/graphql'
 
 @ObjectType()
 export class VehiclesBulkMileageRegistrationRequestError {
@@ -7,4 +7,10 @@ export class VehiclesBulkMileageRegistrationRequestError {
 
   @Field({ nullable: true })
   message?: string
+
+  @Field(() => Int, { nullable: true })
+  warningSerialCode?: number
+
+  @Field({ nullable: true })
+  warningText?: string
 }
diff --git a/libs/api/domains/vehicles/src/lib/resolvers/bulkMileage.resolver.ts b/libs/api/domains/vehicles/src/lib/resolvers/bulkMileage.resolver.ts
@@ -66,6 +66,7 @@ export class VehiclesBulkMileageResolver {
   ) {
     return this.bulkService.getBulkMileageRegistrationRequestOverview(
       user,
+      input.locale,
       input.guid,
     )
   }

diff --git a/libs/api/domains/vehicles/src/lib/services/bulkMileage.service.ts b/libs/api/domains/vehicles/src/lib/services/bulkMileage.service.ts
@@ -7,18 +7,24 @@ import { AuthMiddleware } from '@island.is/auth-nest-tools'
 import type { Auth, User } from '@island.is/auth-nest-tools'
 import { PostVehicleBulkMileageInput } from '../dto/postBulkVehicleMileage.input'
 import { isDefined } from '@island.is/shared/utils'
+import type { Locale } from '@island.is/shared/types'
 import { LOG_CATEGORY } from '../constants'
 import { LOGGER_PROVIDER, type Logger } from '@island.is/logging'
 import { VehiclesBulkMileageReadingResponse } from '../models/v3/bulkMileage/bulkMileageReadingResponse.model'
 import { VehiclesBulkMileageRegistrationJobHistory } from '../models/v3/bulkMileage/bulkMileageRegistrationJobHistory.model'
 import { VehiclesBulkMileageRegistrationRequestStatus } from '../models/v3/bulkMileage/bulkMileageRegistrationRequestStatus.model'
 import { VehiclesBulkMileageRegistrationRequestOverview } from '../models/v3/bulkMileage/bulkMileageRegistrationRequestOverview.model'
 import { FetchError } from '@island.is/clients/middlewares'
+import { IntlService } from '@island.is/cms-translations'
+import { errorCodeMessageMap } from './errorCodes'
+
+const namespaces = ['api.bulk-vehicle-mileage']
 
 @Injectable()
 export class BulkMileageService {
   constructor(
     private mileageReadingApi: MileageReadingApi,
+    private readonly intlService: IntlService,
     @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
   ) {}
 
@@ -59,7 +65,6 @@ export class BulkMileageService {
 
       return {
         requestId: res.guid,
-        errorMessage: res.errorMessage ?? undefined,
       }
     } catch (e) {
       const error: Error = e
@@ -127,8 +132,10 @@ export class BulkMileageService {
 
   async getBulkMileageRegistrationRequestOverview(
     auth: User,
+    locale: Locale,
     input: GetbulkmileagereadingrequeststatusGuidGetRequest['guid'],
   ): Promise<VehiclesBulkMileageRegistrationRequestOverview> {
+    const { formatMessage } = await this.intlService.useIntl(namespaces, locale)
     const data = await this.getMileageWithAuth(
       auth,
     ).getbulkmileagereadingrequestdetailsGuidGet({ guid: input })
@@ -139,15 +146,25 @@ export class BulkMileageService {
           if (!d.guid || !d.permno) {
             return null
           }
+
           return {
             guid: d.guid,
             vehicleId: d.permno,
             mileage: d.mileage ?? undefined,
             returnCode: d.returnCode ?? undefined,
-            errors: d.errors?.map((e) => ({
-              code: e.errorCode ?? undefined,
-              message: e.errorText ?? undefined,
-            })),
+            errors: d.errors?.map((e) => {
+              const warningSerial =
+                e.warningSerial === -1 ? 999 : e.warningSerial
+
+              return {
+                code: e.errorCode ?? undefined,
+                message: e.errorText ?? undefined,
+                warningSerialCode: e.warningSerial,
+                warningText: warningSerial
+                  ? formatMessage(errorCodeMessageMap[warningSerial])
+                  : undefined,
+              }
+            }),
           }
         })
         .filter(isDefined),

diff --git a/libs/api/domains/vehicles/src/lib/services/errorCodes.ts b/libs/api/domains/vehicles/src/lib/services/errorCodes.ts
@@ -0,0 +1,24 @@
+import { MessageDescriptor } from 'react-intl'
+import { m } from '../../lib/messages'
+
+export const errorCodeMessageMap: Record<number, MessageDescriptor> = {
+  999: m.tooManyPermno, //returned error code is -1, which cant be used to index. Transform to 999
+  3: m.missingPermno,
+  4: m.dateMissing,
+  5: m.originMissing,
+  6: m.mileageMissing,
+  7: m.mileageTooLow,
+  8: m.mileageLowerThanBefore,
+  9: m.originNotFound,
+  10: m.carNotFound,
+  11: m.dateTooEarly,
+  12: m.invalidUpdate,
+  13: m.registerTooEarly,
+  14: m.forbiddenUpdate,
+  15: m.unauthorizedUpdater,
+  16: m.invalidMileage,
+  17: m.invalidDelete,
+  18: m.notFoundDelete,
+  19: m.unnecessaryRegistration,
+  20: m.tooHighMileage,
+}
diff --git a/libs/api/domains/vehicles/src/lib/services/vehicles.service.ts b/libs/api/domains/vehicles/src/lib/services/vehicles.service.ts
@@ -11,15 +11,13 @@ import {
   VehicleDtoListPagedResponse,
   PersidnoLookupResultDto,
   CurrentVehiclesWithMilageAndNextInspDtoListPagedResponse,
-  ApiResponse,
 } from '@island.is/clients/vehicles'
 import {
   CanregistermileagePermnoGetRequest,
   GetMileageReadingRequest,
   MileageReadingApi,
   MileageReadingDto,
   PostMileageReadingModel,
-  PutMileageReadingModel,
   RequiresmileageregistrationPermnoGetRequest,
   RootPostRequest,
   RootPutRequest,
@@ -35,10 +33,7 @@ import {
   GetVehiclesForUserInput,
   GetVehiclesListV2Input,
 } from '../dto/getVehiclesForUserInput'
-import {
-  VehicleMileageDetail,
-  VehicleMileageOverview,
-} from '../models/getVehicleMileage.model'
+import { VehicleMileageOverview } from '../models/getVehicleMileage.model'
 import isSameDay from 'date-fns/isSameDay'
 import { mileageDetailConstructor } from '../utils/helpers'
 import { FetchError, handle404 } from '@island.is/clients/middlewares'
@@ -470,9 +465,11 @@ export class VehiclesService {
       throw new ForbiddenException(UNAUTHORIZED_OWNERSHIP_LOG)
     }
 
-    return this.getMileageWithAuth(auth).rootPut({
+    const dtos = await this.getMileageWithAuth(auth).rootPut({
       putMileageReadingModel: input,
     })
+
+    return dtos.length > 0 ? dtos[0] : null
   }
 
   async postMileageReadingV2(
@@ -537,9 +534,10 @@ export class VehiclesService {
     }
 
     try {
-      return this.getMileageWithAuth(auth).rootPut({
+      const dtos = await this.getMileageWithAuth(auth).rootPut({
         putMileageReadingModel: input,
       })
+      return dtos.length > 0 ? dtos[0] : null
     } catch (e) {
       if (e instanceof FetchError && (e.status === 400 || e.status === 429)) {
         const errorBody = e.body as UpdateResponseError

diff --git a/libs/api/domains/vehicles/src/lib/vehicles.module.ts b/libs/api/domains/vehicles/src/lib/vehicles.module.ts
@@ -11,6 +11,7 @@ import { FeatureFlagModule } from '@island.is/nest/feature-flags'
 import { BulkMileageService } from './services/bulkMileage.service'
 import { VehiclesV3Resolver } from './resolvers/vehicleV3.resolver'
 import { VehiclesBulkMileageResolver } from './resolvers/bulkMileage.resolver'
+import { CmsTranslationsModule } from '@island.is/cms-translations'
 
 @Module({
   providers: [
@@ -26,6 +27,7 @@ import { VehiclesBulkMileageResolver } from './resolvers/bulkMileage.resolver'
     VehiclesClientModule,
     VehiclesMileageClientModule,
     AuthModule,
+    CmsTranslationsModule,
     FeatureFlagModule,
   ],
   exports: [VehiclesService],

diff --git a/libs/clients/vehicles-mileage/src/clientConfig.json b/libs/clients/vehicles-mileage/src/clientConfig.json
@@ -2,13 +2,14 @@
   "openapi": "3.0.1",
   "info": {
     "title": "SGS Rest API",
-    "description": "Mileage reading API developed in .Net8.0 - Release-6 : 20231122.2",
+    "description": "Mileage reading API developed in .Net8.0 - Release-21 : 20241105.1",
     "contact": {
       "name": "Samgöngustofa",
       "email": "tolvuhjalp@samgongustofa.is"
     },
     "version": "1.0"
   },
+  "servers": [{ "url": "/vehicle/mileagereading" }],
   "paths": {
     "/authenticate": {
       "post": {
@@ -243,11 +244,14 @@
           }
         },
         "responses": {
-          "201": {
+          "200": {
             "description": "OK",
             "content": {
               "application/json": {
-                "schema": { "$ref": "#/components/schemas/MileageReadingDto" }
+                "schema": {
+                  "type": "array",
+                  "items": { "$ref": "#/components/schemas/MileageReadingDto" }
+                }
               }
             }
           },
@@ -788,6 +792,11 @@
             "description": "Error code",
             "nullable": true
           },
+          "warningSerial": {
+            "type": "integer",
+            "description": "Warning serial",
+            "format": "int32"
+          },
           "errorText": {
             "type": "string",
             "description": "Error text",
@@ -850,11 +859,6 @@
             "type": "string",
             "description": "Guid to check for status and results",
             "nullable": true
-          },
-          "errorMessage": {
-            "type": "string",
-            "description": "Error message if any",
-            "nullable": true
           }
         },
         "additionalProperties": false,

diff --git a/libs/service-portal/assets/src/lib/messages.ts b/libs/service-portal/assets/src/lib/messages.ts
@@ -218,6 +218,11 @@ export const vehicleMessage = defineMessages({
     id: 'sp.vehicles:not-found',
     defaultMessage: 'Ökutæki fannst ekki',
   },
+  invalidFileType: {
+    id: 'sp.vehicles:invalid-file-type',
+    defaultMessage:
+      'Ógild skráargerð. Einungis .xlsx og .csv skrár eru samþykktar',
+  },
   infoNote: {
     id: 'sp.vehicles:detail-info-note',
     defaultMessage:
@@ -981,6 +986,10 @@ export const vehicleMessage = defineMessages({
     id: 'sp.vehicles:upload-failed',
     defaultMessage: 'Upphleðsla mistókst',
   },
+  noDataInUploadedFile: {
+    id: 'sp.vehicles:no-data-in-uploaded-file',
+    defaultMessage: 'Upphleðsla mistókst. Engin gögn í skjali',
+  },
   wrongFileType: {
     id: 'sp.vehicles:wrong-file-type',
     defaultMessage: 'Vitlaus skráartýpa. Skrá verður að vera .csv eða .xslx',
@@ -989,6 +998,16 @@ export const vehicleMessage = defineMessages({
     id: 'sp.vehicles:error-while-processing',
     defaultMessage: 'Villa við að meðhöndla skjal. Villur: ',
   },
+  invalidPermNoColumn: {
+    id: 'sp.vehicles:invalid-perm-no-column',
+    defaultMessage:
+      'Fastanúmersdálk vantar eða er skrifaður rangt. Dálkanafn þarf að vera eitt af eftirfarandi; "permno", "vehicleid", "bilnumer","okutaeki","fastanumer"',
+  },
+  invalidMileageColumn: {
+    id: 'sp.vehicles:invalid-mileage-column',
+    defaultMessage:
+      'Kílómetrastöðudálk vantar eða er skrifaður rangt. Dálkanafn þarf að vera eitt af eftirfarandi; "kilometrastada", "mileage", "odometer"',
+  },
   downloadFailed: {
     id: 'sp.vehicles:download-failed',
     defaultMessage: 'Niðurhal mistókst',
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,6 +66,7 @@ export class VehiclesBulkMileageResolver { @@
       ) {
         return this.bulkService.getBulkMileageRegistrationRequestOverview(
           user,
+          input.locale,
           input.guid,
         )
       }
@@ Expand Down @@