From d377f0191f72c2e65bec71b06129bf43cfe4e2d2 Mon Sep 17 00:00:00 2001
From: Tom Winter <tom@aam-digital.com>
Date: Thu, 28 Nov 2024 21:16:50 +0100
Subject: [PATCH] fix: default query params and escoUri

---
 .../aambackendservice/skill/controller/SkillController.kt | 8 ++++----
 .../skill/core/SqlSearchUserProfileUseCase.kt             | 2 +-
 .../skill/skilllab/SkillLabSyncUserProfileUseCase.kt      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/aam-backend-service/src/main/kotlin/com/aamdigital/aambackendservice/skill/controller/SkillController.kt b/application/aam-backend-service/src/main/kotlin/com/aamdigital/aambackendservice/skill/controller/SkillController.kt
index d2b97f6..3588077 100644
--- a/application/aam-backend-service/src/main/kotlin/com/aamdigital/aambackendservice/skill/controller/SkillController.kt
+++ b/application/aam-backend-service/src/main/kotlin/com/aamdigital/aambackendservice/skill/controller/SkillController.kt
@@ -30,9 +30,9 @@ class SkillController(
 
     @GetMapping("/user-profile")
     fun fetchUserProfiles(
-        fullName: String?,
-        email: String?,
-        phone: String?,
+        fullName: String = "",
+        email: String = "",
+        phone: String = "",
     ): ResponseEntity<Any> {
         val result = searchUserProfileUseCase.run(
             request = SearchUserProfileRequest(
@@ -93,7 +93,7 @@ class SkillController(
                     skills = entity.skills.map {
                         EscoSkill(
                             usage = SkillUsage.valueOf(it.usage.uppercase()),
-                            escoUri = it.externalIdentifier
+                            escoUri = it.escoUri
                         )
                     },
                     updatedAtExternalSystem = entity.updatedAt,
diff --git a/application/aam-backend-service/src/main/kotlin/com/aamdigital/aambackendservice/skill/core/SqlSearchUserProfileUseCase.kt b/application/aam-backend-service/src/main/kotlin/com/aamdigital/aambackendservice/skill/core/SqlSearchUserProfileUseCase.kt
index 5335645..a13ede9 100644
--- a/application/aam-backend-service/src/main/kotlin/com/aamdigital/aambackendservice/skill/core/SqlSearchUserProfileUseCase.kt
+++ b/application/aam-backend-service/src/main/kotlin/com/aamdigital/aambackendservice/skill/core/SqlSearchUserProfileUseCase.kt
@@ -63,7 +63,7 @@ class SqlSearchUserProfileUseCase(
                         skills = it.skills.map { skill ->
                             EscoSkill(
                                 usage = SkillUsage.valueOf(skill.usage.uppercase()),
-                                escoUri = skill.externalIdentifier
+                                escoUri = skill.escoUri
                             )
                         },
                         latestSyncAt = it.latestSyncAt?.toInstant(),
diff --git a/application/aam-backend-service/src/main/kotlin/com/aamdigital/aambackendservice/skill/skilllab/SkillLabSyncUserProfileUseCase.kt b/application/aam-backend-service/src/main/kotlin/com/aamdigital/aambackendservice/skill/skilllab/SkillLabSyncUserProfileUseCase.kt
index 86089db..4d136f8 100644
--- a/application/aam-backend-service/src/main/kotlin/com/aamdigital/aambackendservice/skill/skilllab/SkillLabSyncUserProfileUseCase.kt
+++ b/application/aam-backend-service/src/main/kotlin/com/aamdigital/aambackendservice/skill/skilllab/SkillLabSyncUserProfileUseCase.kt
@@ -49,7 +49,7 @@ class SkillLabSyncUserProfileUseCase(
                     skills = allSkillsEntities.map { skill ->
                         EscoSkill(
                             usage = SkillUsage.valueOf(skill.usage.uppercase()),
-                            escoUri = skill.externalIdentifier
+                            escoUri = skill.escoUri
                         )
                     },
                     updatedAtExternalSystem = userProfileEntity.updatedAt,