From 286b64b6c2548f56157faa72dd458dd42c137fca Mon Sep 17 00:00:00 2001
From: Matteo Saloni <matteo.saloni@gmail.com>
Date: Thu, 24 Oct 2024 11:45:29 +0200
Subject: [PATCH] feat: update subject to expose id + fix search impl

---
 .../it/smartcommunitylab/aac/core/service/SubjectService.java | 4 ++--
 src/main/java/it/smartcommunitylab/aac/model/Subject.java     | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/it/smartcommunitylab/aac/core/service/SubjectService.java b/src/main/java/it/smartcommunitylab/aac/core/service/SubjectService.java
index d33407acb..d41d34cf6 100644
--- a/src/main/java/it/smartcommunitylab/aac/core/service/SubjectService.java
+++ b/src/main/java/it/smartcommunitylab/aac/core/service/SubjectService.java
@@ -188,7 +188,7 @@ public List<Subject> searchSubjects(String realm, String q) {
                 realm,
                 q
             )
-            : Collections.emptyList();
+            : subjectRepository.findByRealm(realm);
 
         return subjects.stream().map(s -> toSubject(s)).collect(Collectors.toList());
     }
@@ -379,7 +379,7 @@ public List<GrantedAuthority> updateAuthorities(String uuid, String realm, Colle
         List<SubjectAuthorityEntity> oldRoles = authorityRepository.findBySubjectAndRealm(uuid, realm);
 
         // unpack roles
-        Set<SubjectAuthorityEntity> newRoles = roles
+        Set<SubjectAuthorityEntity> newRoles = roles == null ? Collections.emptySet() : roles
             .stream()
             .map(r -> {
                 SubjectAuthorityEntity re = new SubjectAuthorityEntity(uuid);
diff --git a/src/main/java/it/smartcommunitylab/aac/model/Subject.java b/src/main/java/it/smartcommunitylab/aac/model/Subject.java
index bd58c85f0..ef3902300 100644
--- a/src/main/java/it/smartcommunitylab/aac/model/Subject.java
+++ b/src/main/java/it/smartcommunitylab/aac/model/Subject.java
@@ -59,6 +59,10 @@ public String getSubjectId() {
         return subjectId;
     }
 
+    public String getId() {
+        return getSubjectId();
+    }
+
     public String getRealm() {
         return realm;
     }