From bc431df6d69534e076f3ef37652df13cff888f15 Mon Sep 17 00:00:00 2001
From: cesarLima1 <cesmaulim@gmail.com>
Date: Fri, 27 Mar 2026 12:19:30 -0400
Subject: [PATCH 1/2] [TM-3197] apply owner logic to add user

---
 apps/user-service/src/users/users.controller.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/user-service/src/users/users.controller.ts b/apps/user-service/src/users/users.controller.ts
index 8902a9a37..0abf32762 100644
--- a/apps/user-service/src/users/users.controller.ts
+++ b/apps/user-service/src/users/users.controller.ts
@@ -142,7 +142,8 @@ export class UsersController {
     const org = await user.primaryOrganisation();
     if (org != null) {
       const orgResource = document.addData(org.uuid, new OrganisationLightDto(org));
-      const userStatus = org.OrganisationUser?.status ?? "na";
+      const isOwner = user.organisationId === org.id;
+      const userStatus = isOwner ? "approved" : org.OrganisationUser?.status ?? "na";
       userResource.relateTo("org", orgResource, { meta: { userStatus } });
     }
 

From 8d762c3831b71b28728246a98d10f0b5f17631a3 Mon Sep 17 00:00:00 2001
From: cesarLima1 <cesmaulim@gmail.com>
Date: Fri, 27 Mar 2026 12:55:24 -0400
Subject: [PATCH 2/2] [TM-3197] update unit test

---
 apps/user-service/src/users/users.controller.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/user-service/src/users/users.controller.spec.ts b/apps/user-service/src/users/users.controller.spec.ts
index 65b04a382..3182f8dc5 100644
--- a/apps/user-service/src/users/users.controller.spec.ts
+++ b/apps/user-service/src/users/users.controller.spec.ts
@@ -90,7 +90,7 @@ describe("UsersController", () => {
       });
     });
 
-    it('should return "na" for userStatus if there is no many to many relationship', async () => {
+    it('should return "approved" for userStatus if user belongs to org without many-to-many relationship', async () => {
       const user = await UserFactory.create();
       const org = await OrganisationFactory.create();
       await user.$set("organisation", org);
@@ -104,7 +104,7 @@ describe("UsersController", () => {
       expect(relationship).toMatchObject({
         type: "organisations",
         id: org.uuid,
-        meta: { userStatus: "na" }
+        meta: { userStatus: "approved" }
       });
     });
   });