fix(skilavottord): Improve error handling when creating access and co…

…mpanies (#16559)

* TS-931 Fix error handling when creating a new access and companies

* TS-931 Fix error handling when updating  access

* TS-931 Improve the error msg to the user

---------

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

apps/skilavottord/web/screens/AccessControl/AccessControl.tsx

@@ -135,6 +135,9 @@ const AccessControl: FC<React.PropsWithChildren<unknown>> = () => {
   const [createSkilavottordAccessControl] = useMutation(
     CreateSkilavottordAccessControlMutation,
     {
+      onError(_) {
+        // Hide Runtime error message. The error message is already shown to the user in toast.
+      },
       refetchQueries: [
         {
           query: SkilavottordAccessControlsQuery,
@@ -145,6 +148,9 @@ const AccessControl: FC<React.PropsWithChildren<unknown>> = () => {
   const [updateSkilavottordAccessControl] = useMutation(
     UpdateSkilavottordAccessControlMutation,
     {
+      onError(_) {
+        // Hide Runtime error message. The error message is already shown to the user in toast.
+      },
       refetchQueries: [
         {
           query: SkilavottordAccessControlsQuery,

apps/skilavottord/web/screens/RecyclingCompanies/RecyclingCompanyCreate/RecyclingCompanyCreate.tsx

@@ -50,6 +50,9 @@ const RecyclingCompanyCreate: FC<React.PropsWithChildren<unknown>> = () => {
   const [createSkilavottordRecyclingPartner] = useMutation(
     CreateSkilavottordRecyclingPartnerMutation,
     {
+      onError: (_) => {
+        // Hide Runtime error message. The error message is already shown to the user in toast.
+      },
       refetchQueries: [
         {
           query: SkilavottordAllRecyclingPartnersQuery,

apps/skilavottord/ws/src/app/modules/accessControl/accessControl.resolver.ts

@@ -1,16 +1,20 @@
-import { Query, Resolver, Args, Mutation } from '@nestjs/graphql'
-import { NotFoundException, BadRequestException } from '@nestjs/common'
+import {
+  BadRequestException,
+  ConflictException,
+  NotFoundException,
+} from '@nestjs/common'
+import { Args, Mutation, Query, Resolver } from '@nestjs/graphql'
 import { ApolloError } from 'apollo-server-express'
 
-import { Authorize, CurrentUser, User, Role } from '../auth'
+import { Authorize, CurrentUser, Role, User } from '../auth'
 
-import { AccessControlModel } from './accessControl.model'
-import { AccessControlService } from './accessControl.service'
 import {
-  UpdateAccessControlInput,
   CreateAccessControlInput,
   DeleteAccessControlInput,
+  UpdateAccessControlInput,
 } from './accessControl.input'
+import { AccessControlModel } from './accessControl.model'
+import { AccessControlService } from './accessControl.service'
 
 @Authorize({
   roles: [Role.developer, Role.recyclingFund, Role.recyclingCompanyAdmin],
@@ -77,6 +81,15 @@ export class AccessControlResolver {
     this.verifyDeveloperAccess(user, input.role)
     this.verifyRecyclingCompanyAdminInput(input.role, user)
     this.verifyRecyclingCompanyInput(input)
+
+    const access = await this.accessControlService.findOne(input.nationalId)
+
+    if (access) {
+      throw new ConflictException(
+        `Access with the national id ${input.nationalId} already exists`,
+      )
+    }
+
     return this.accessControlService.createAccess(input)
   }
 

apps/skilavottord/ws/src/app/modules/recyclingPartner/recyclingPartner.resolver.ts

@@ -56,7 +56,7 @@ export class RecyclingPartnerResolver {
 
     if (recyclingPartner) {
       throw new ConflictException(
-        'Recycling partner with that id already exists',
+        `Recycling partner with the id ${input.companyId} already exists`,
       )
     }