Skip to content

[TM-3197] apply owner logic to add user #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cesarLima1 merged 2 commits into from
Mar 27, 2026
Merged

[TM-3197] apply owner logic to add user #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc431df
[TM-3197] apply owner logic to add user
cesarLima1 Mar 27, 2026
8d762c3
[TM-3197] update unit test
cesarLima1 Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/user-service/src/users/users.controller.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -104,7 +104,7 @@ describe("UsersController", () => {
expect(relationship).toMatchObject({
type: "organisations",
id: org.uuid,
meta: { userStatus: "na" }
meta: { userStatus: "approved" }
});
});
});
Expand Down
3 changes: 2 additions & 1 deletion apps/user-service/src/users/users.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } });
}

Expand Down
Loading