fix(bulk-mileage): update bulk mileage

libs/api/domains/vehicles/src/lib/dto/updateResponseError.dto.ts

@@ -0,0 +1,12 @@
+export interface UpdateResponseError {
+  type: string
+  title: string
+  status: number
+  Errors: Array<{
+    lookupNo: number
+    warnSever: string
+    errorMess: string
+    permno: string
+    warningSerialNumber: string
+  }>
+}

libs/api/domains/vehicles/src/lib/models/v3/postVehicleMileageResponse.model.ts

@@ -0,0 +1,15 @@
+import { createUnionType } from '@nestjs/graphql'
+import { VehicleMileageDetail } from '../getVehicleMileage.model'
+import { VehiclesMileageUpdateError } from './vehicleMileageResponseError.model'
+
+export const VehicleMileagePostResponse = createUnionType({
+  name: 'VehicleMileagePostResponse',
+  types: () => [VehicleMileageDetail, VehiclesMileageUpdateError] as const,
+  resolveType(value) {
+    if ('permno' in value && value.permno !== undefined) {
+      return VehicleMileageDetail
+    }
+
+    return VehiclesMileageUpdateError
+  },
+})

libs/api/domains/vehicles/src/lib/models/v3/putVehicleMileageResponse.model.ts

@@ -0,0 +1,15 @@
+import { createUnionType } from '@nestjs/graphql'
+import { VehicleMileagePutModel } from '../getVehicleMileage.model'
+import { VehiclesMileageUpdateError } from './vehicleMileageResponseError.model'
+
+export const VehicleMileagePutResponse = createUnionType({
+  name: 'VehicleMileagePutResponse',
+  types: () => [VehicleMileagePutModel, VehiclesMileageUpdateError] as const,
+  resolveType(value) {
+    if ('permno' in value && value.permno !== undefined) {
+      return VehicleMileagePutModel
+    }
+
+    return VehiclesMileageUpdateError
+  },
+})

libs/api/domains/vehicles/src/lib/models/v3/vehicleMileageResponseError.model.ts

@@ -0,0 +1,14 @@
+import { Field, Int, ObjectType } from '@nestjs/graphql'
+import GraphQLJSON from 'graphql-type-json'
+
+@ObjectType()
+export class VehiclesMileageUpdateError {
+  @Field()
+  message!: string
+
+  @Field(() => Int, { nullable: true })
+  code?: number
+
+  @Field(() => GraphQLJSON, { nullable: true })
+  error?: string
+}

libs/api/domains/vehicles/src/lib/resolvers/mileage.resolver.ts

@@ -35,6 +35,9 @@ import {
 } from '@island.is/nest/feature-flags'
 import { mileageDetailConstructor } from '../utils/helpers'
 import { LOGGER_PROVIDER, type Logger } from '@island.is/logging'
+import { VehicleMileagePostResponse } from '../models/v3/postVehicleMileageResponse.model'
+import { VehiclesMileageUpdateError } from '../models/v3/vehicleMileageResponseError.model'
+import { VehicleMileagePutResponse } from '../models/v3/putVehicleMileageResponse.model'
 
 @UseGuards(IdsUserGuard, ScopesGuard, FeatureFlagGuard)
 @FeatureFlag(Features.servicePortalVehicleMileagePageEnabled)
@@ -99,6 +102,48 @@ export class VehiclesMileageResolver {
     return mileageDetailConstructor(res)
   }
 
+  @Mutation(() => VehicleMileagePostResponse, {
+    name: 'vehicleMileagePostV2',
+    nullable: true,
+  })
+  @Audit()
+  async postVehicleMileageReadingV2(
+    @Args('input') input: PostVehicleMileageInput,
+    @CurrentUser() user: User,
+  ) {
+    const res = await this.vehiclesService.postMileageReadingV2(user, {
+      ...input,
+      mileage: Number(input.mileage ?? input.mileageNumber),
+    })
+
+    if (!res || res instanceof VehiclesMileageUpdateError) {
+      return res
+    }
+
+    return mileageDetailConstructor(res)
+  }
+
+  @Mutation(() => VehicleMileagePutResponse, {
+    name: 'vehicleMileagePutV2',
+    nullable: true,
+  })
+  @Audit()
+  async putVehicleMileageReadingV2(
+    @Args('input') input: PutVehicleMileageInput,
+    @CurrentUser() user: User,
+  ) {
+    const res = await this.vehiclesService.putMileageReadingV2(user, {
+      ...input,
+      mileage: Number(input.mileage ?? input.mileageNumber),
+    })
+
+    if (!res || res instanceof VehiclesMileageUpdateError) {
+      return res
+    }
+
+    return mileageDetailConstructor(res)
+  }
+
   @ResolveField('canRegisterMileage', () => Boolean, {
     nullable: true,
   })

libs/api/domains/vehicles/src/lib/services/vehicles.service.ts

@@ -11,13 +11,15 @@ import {
   VehicleDtoListPagedResponse,
   PersidnoLookupResultDto,
   CurrentVehiclesWithMilageAndNextInspDtoListPagedResponse,
+  ApiResponse,
 } from '@island.is/clients/vehicles'
 import {
   CanregistermileagePermnoGetRequest,
   GetMileageReadingRequest,
   MileageReadingApi,
   MileageReadingDto,
   PostMileageReadingModel,
+  PutMileageReadingModel,
   RequiresmileageregistrationPermnoGetRequest,
   RootPostRequest,
   RootPutRequest,
@@ -33,17 +35,22 @@ import {
   GetVehiclesForUserInput,
   GetVehiclesListV2Input,
 } from '../dto/getVehiclesForUserInput'
-import { VehicleMileageOverview } from '../models/getVehicleMileage.model'
+import {
+  VehicleMileageDetail,
+  VehicleMileageOverview,
+} from '../models/getVehicleMileage.model'
 import isSameDay from 'date-fns/isSameDay'
 import { mileageDetailConstructor } from '../utils/helpers'
-import { handle404 } from '@island.is/clients/middlewares'
+import { FetchError, handle404 } from '@island.is/clients/middlewares'
 import { VehicleSearchCustomDto } from '../vehicles.type'
 import { operatorStatusMapper } from '../utils/operatorStatusMapper'
 import { VehiclesListInputV3 } from '../dto/vehiclesListInputV3'
 import { VehiclesCurrentListResponse } from '../models/v3/currentVehicleListResponse.model'
 import { isDefined } from '@island.is/shared/utils'
 import { GetVehicleMileageInput } from '../dto/getVehicleMileageInput'
 import { MileageRegistrationHistory } from '../models/v3/mileageRegistrationHistory.model'
+import { VehiclesMileageUpdateError } from '../models/v3/vehicleMileageResponseError.model'
+import { UpdateResponseError } from '../dto/updateResponseError.dto'
 
 const ORIGIN_CODE = 'ISLAND.IS'
 const LOG_CATEGORY = 'vehicle-service'
@@ -463,6 +470,82 @@ export class VehiclesService {
     })
   }
 
+  async postMileageReadingV2(
+    auth: User,
+    input: RootPostRequest['postMileageReadingModel'],
+  ): Promise<PostMileageReadingModel | VehiclesMileageUpdateError | null> {
+    if (!input) return null
+
+    const isAllowed = await this.isAllowedMileageRegistration(
+      auth,
+      input.permno,
+    )
+    if (!isAllowed) {
+      this.logger.error(UNAUTHORIZED_OWNERSHIP_LOG, {
+        category: LOG_CATEGORY,
+        error: 'postMileageReading failed',
+      })
+      throw new ForbiddenException(UNAUTHORIZED_OWNERSHIP_LOG)
+    }
+
+    try {
+      const res = await this.getMileageWithAuth(auth).rootPostRaw({
+        postMileageReadingModel: input,
+      })
+
+      if (res.raw.status === 200) {
+        this.logger.info(
+          'Tried to post already existing mileage reading. Should use PUT',
+        )
+        return null
+      }
+
+      const value = await res.value()
+      return value
+    } catch (e) {
+      if (e instanceof FetchError && (e.status === 400 || e.status === 429)) {
+        const errorBody = e.body as UpdateResponseError
+        return {
+          code: e.status,
+          message: errorBody.Errors?.[0]?.errorMess || 'Unknown error',
+        }
+      } else throw e
+    }
+  }
+
+  async putMileageReadingV2(
+    auth: User,
+    input: RootPutRequest['putMileageReadingModel'],
+  ): Promise<MileageReadingDto | VehiclesMileageUpdateError | null> {
+    if (!input) return null
+
+    const isAllowed = await this.isAllowedMileageRegistration(
+      auth,
+      input.permno,
+    )
+    if (!isAllowed) {
+      this.logger.error(UNAUTHORIZED_OWNERSHIP_LOG, {
+        category: LOG_CATEGORY,
+        error: 'putMileageReading failed',
+      })
+      throw new ForbiddenException(UNAUTHORIZED_OWNERSHIP_LOG)
+    }
+
+    try {
+      return this.getMileageWithAuth(auth).rootPut({
+        putMileageReadingModel: input,
+      })
+    } catch (e) {
+      if (e instanceof FetchError && (e.status === 400 || e.status === 429)) {
+        const errorBody = e.body as UpdateResponseError
+        return {
+          code: e.status,
+          message: errorBody.Errors?.[0]?.errorMess || 'Unknown error',
+        }
+      } else throw e
+    }
+  }
+
   async canRegisterMileage(
     auth: User,
     input: CanregistermileagePermnoGetRequest,

libs/service-portal/assets/src/lib/messages.ts

@@ -972,6 +972,10 @@ export const vehicleMessage = defineMessages({
     id: 'sp.vehicles:upload-failed',
     defaultMessage: 'Upphleðsla mistókst',
   },
+  wrongFileType: {
+    id: 'sp.vehicles:wrong-file-type',
+    defaultMessage: 'Vitlaus skráartýpa. Skrá verður að vera .csv eða .xslx',
+  },
   errorWhileProcessing: {
     id: 'sp.vehicles:error-while-processing',
     defaultMessage: 'Villa við að meðhöndla skjal. Villur: ',
@@ -1026,7 +1030,7 @@ export const vehicleMessage = defineMessages({
   },
   fileUploadAcceptedTypes: {
     id: 'sp.vehicles:file-upload-accepted-types',
-    defaultMessage: 'Tekið er við skjölum með endingu; .csv',
+    defaultMessage: 'Tekið er við skjölum með endingu; .csv, .xlsx',
   },
   dataAboutJob: {
     id: 'sp.vehicles:data-about-job',
@@ -1064,7 +1068,7 @@ export const vehicleMessage = defineMessages({
   },
   downloadTemplate: {
     id: 'sp.vehicles:download-template',
-    defaultMessage: 'Hlaða niður sniðmáti',
+    defaultMessage: 'Hlaða niður sniðmáti {arg}',
   },
   saveAllVisible: {
     id: 'sp.vehicles:save-all-visible',

libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.graphql

@@ -19,20 +19,32 @@ query vehiclesList($input: VehiclesListInputV3!) {
 }
 
 mutation postSingleVehicleMileage($input: PostVehicleMileageInput!) {
-  vehicleMileagePost(input: $input) {
-    permno
-    readDate
-    originCode
-    mileageNumber
-    internalId
+  vehicleMileagePostV2(input: $input) {
+    ... on VehicleMileageDetail {
+      permno
+      readDate
+      originCode
+      mileageNumber
+      internalId
+    }
+    ... on VehiclesMileageUpdateError {
+      code
+      message
+    }
   }
 }
 
 mutation putSingleVehicleMileage($input: PutVehicleMileageInput!) {
-  vehicleMileagePut(input: $input) {
-    permno
-    internalId
-    mileageNumber
+  vehicleMileagePutV2(input: $input) {
+    ... on VehicleMileagePutModel {
+      permno
+      internalId
+      mileageNumber
+    }
+    ... on VehiclesMileageUpdateError {
+      code
+      message
+    }
   }
 }
 

libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageFileDownloader.tsx

@@ -1,4 +1,4 @@
-import { Button } from '@island.is/island-ui/core'
+import { Button, Inline } from '@island.is/island-ui/core'
 import { useLocale } from '@island.is/localization'
 import { vehicleMessage } from '../../lib/messages'
 import { downloadFile } from '@island.is/service-portal/core'
@@ -12,17 +12,17 @@ const VehicleBulkMileageFileDownloader = ({ onError }: Props) => {
   const { formatMessage } = useLocale()
   const [isLoading, setIsLoading] = useState(false)
 
-  const downloadExampleFile = async () => {
+  const downloadExampleFile = async (type: 'csv' | 'xlsx') => {
     setIsLoading(true)
     try {
       downloadFile(
         `magnskraning_kilometrastodu_example`,
-        ['permno', 'mileage'],
+        ['bilnumer', 'kilometrastada'],
         [
           ['ABC001', 10000],
           ['DEF002', 99999],
         ],
-        'csv',
+        type,
       )
     } catch (error) {
       onError(error)
@@ -32,17 +32,23 @@ const VehicleBulkMileageFileDownloader = ({ onError }: Props) => {
   }
 
   return (
-    <Button
-      colorScheme="default"
-      icon="download"
-      iconType="outline"
-      size="default"
-      variant="utility"
-      onClick={downloadExampleFile}
-      loading={isLoading}
-    >
-      {formatMessage(vehicleMessage.downloadTemplate)}
-    </Button>
+    <Inline space={1}>
+      {(['csv', 'xlsx'] as const).map((type) => (
+        <Button
+          colorScheme="default"
+          icon="download"
+          iconType="outline"
+          size="default"
+          variant="utility"
+          onClick={() => downloadExampleFile(type)}
+          loading={isLoading}
+        >
+          {formatMessage(vehicleMessage.downloadTemplate, {
+            arg: `.${type}`,
+          })}
+        </Button>
+      ))}
+    </Inline>
   )
 }