Merge branch 'feature/new-seminars-application' of github.com:island-…

…is/island.is into feature/new-seminars-application
island-is · Jan 6, 2025 · fe653d8 · fe653d8
2 parents 3c11ceb + 117a102
commit fe653d8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/libs/api/domains/seminars-ver/src/lib/seminars.service.ts b/libs/api/domains/seminars-ver/src/lib/seminars.service.ts
@@ -23,7 +23,7 @@ export class SeminarsService {
   async checkIndividuals(
     auth: User,
     nationalIds: Array<string>,
-    courseID: number,
+    courseID: string,
   ): Promise<Array<IndividualDTO>> {
     const individuals = this.seminarsService.checkIndividuals(
       auth,

diff --git a/libs/application/templates/aosh/seminars/src/fields/Participants/index.tsx b/libs/application/templates/aosh/seminars/src/fields/Participants/index.tsx
@@ -78,7 +78,7 @@ export const Participants: FC<React.PropsWithChildren<FieldBaseProps>> = ({
 
   const getAreIndividualsValid = useLazyAreIndividualsValid()
   const getIsCompanyValidCallback = useCallback(
-    async (nationalIds: Array<string>, courseID: number) => {
+    async (nationalIds: Array<string>, courseID: string) => {
       const { data } = await getAreIndividualsValid({
         nationalIds,
         courseID,
@@ -138,10 +138,8 @@ export const Participants: FC<React.PropsWithChildren<FieldBaseProps>> = ({
         'initialQuery',
         '',
       ) as string
-      const res = await getIsCompanyValidCallback(
-        nationalIds,
-        parseInt(seminarId),
-      )
+      // console.log('seminarId', seminarId)
+      const res = await getIsCompanyValidCallback(nationalIds, seminarId)
 
       let tmpNotValid = false
       const updatedParticipantList: Array<Participant> = participants.map(

diff --git a/libs/application/templates/aosh/seminars/src/graphql/queries.ts b/libs/application/templates/aosh/seminars/src/graphql/queries.ts
@@ -10,7 +10,7 @@ export const IS_COMPANY_VALID = `
 export const ARE_INDIVIDUALS_VALID = `
   query AreIndividualsValid(
     $nationalIds: [String!]! 
-    $courseID: Float!
+    $courseID: String!
   ) {
     areIndividualsValid(
       nationalIds: $nationalIds 

diff --git a/libs/application/templates/aosh/seminars/src/hooks/useLazyAreIndividualsValid.ts b/libs/application/templates/aosh/seminars/src/hooks/useLazyAreIndividualsValid.ts
@@ -10,7 +10,7 @@ export const useLazyAreIndividualsValid = () => {
     },
     {
       nationalIds: Array<string>
-      courseID: number
+      courseID: string
     }
   >(
     gql`

diff --git a/libs/clients/seminars-ver/src/clientConfig.json b/libs/clients/seminars-ver/src/clientConfig.json
@@ -112,8 +112,8 @@
             "name": "courseID",
             "in": "query",
             "schema": {
-              "type": "integer",
-              "format": "int64"
+              "type": "string",
+              "format": "uuid"
             }
           },
           {

diff --git a/libs/clients/seminars-ver/src/lib/seminars.service.ts b/libs/clients/seminars-ver/src/lib/seminars.service.ts
@@ -53,7 +53,7 @@ export class SeminarsClientService {
   async checkIndividuals(
     auth: User,
     nationalIds: Array<string>,
-    courseID: number,
+    courseID: string,
   ): Promise<Array<IndividualDTO>> {
     return await this.individualApiWithAuth(auth).apiIndividualGet({
       courseID,
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ export const useLazyAreIndividualsValid = () => { @@
         },
         {
           nationalIds: Array<string>
-          courseID: number
+          courseID: string
         }
       >(
         gql`
@@ Expand Down @@