✨ feat(organizations): add color scheme, change member role (#765)

* ✨ feat(organizations): color and change role

* chore: test color validation

* chore: use docker hub for base image

Dockerfile

@@ -1,4 +1,4 @@
-FROM public.ecr.aws/docker/library/node:lts
+FROM node:lts
 WORKDIR /usr/src/app
 
 ENV PNPM_HOME="/pnpm"

Dockerfile.prod

@@ -1,4 +1,4 @@
-FROM public.ecr.aws/docker/library/node:lts-slim AS base
+FROM node:lts-slim AS base
 WORKDIR /usr/src/app
 
 LABEL org.opencontainers.image.source https://github.com/rubberdok/indok-api

prisma/schema.prisma

@@ -269,6 +269,7 @@ model Organization {
  description String @default("")
  createdAt DateTime @default(now())
  updatedAt DateTime @updatedAt
+ colorScheme String?
 
  events Event[]
  members Member[]

schema.graphql

@@ -270,6 +270,11 @@ type CreateOrderResponse {
 }
 
 input CreateOrganizationInput {
+ """
+ The primary color (hex) for the organization, for example: #FF0000 for red.
+ """
+ colorScheme: String
+
  """The description of the organization, cannot exceed 10 000 characters"""
  description: String
 
@@ -858,6 +863,9 @@ type Mutation {
  Passing null or omitting a value will leave the value unchanged.
  """
  updateOrganization(data: UpdateOrganizationInput!): UpdateOrganizationResponse!
+
+ """Change the role of a member in the organization"""
+ updateRole(data: UpdateRoleInput!): UpdateRoleResponse!
  updateUser(data: UpdateUserInput!): UpdateUserResponse!
  uploadFile(data: UploadFileInput!): UploadFileResponse!
 }
@@ -969,6 +977,10 @@ type OrdersResponse {
 }
 
 type Organization {
+ """
+ The primary color (hex) for the organization, for example: #FF0000 for red.
+ """
+ colorScheme: String
  description: String!
  events: [Event!]!
 
@@ -1571,6 +1583,11 @@ type UpdateListingResponse {
 }
 
 input UpdateOrganizationInput {
+ """
+ The primary color (hex) for the organization, for example: #FF0000 for red.
+ """
+ colorScheme: String
+
  """
  The new description of the organization, cannot exceed 10 000 characters
  Omitting the value or passing null will leave the description unchanged
@@ -1598,6 +1615,18 @@ type UpdateOrganizationResponse {
  organization: Organization!
 }
 
+input UpdateRoleInput {
+ """The ID of the member to change the role of"""
+ memberId: ID!
+
+ """The new role of the member"""
+ role: Role!
+}
+
+type UpdateRoleResponse {
+ member: Member!
+}
+
 input UpdateSlotInput {
  capacity: Int
  gradeYears: [Int!]

src/domain/organizations.ts

@@ -19,6 +19,7 @@ class Organization {
  id: string;
  name: string;
  description: string;
+ colorScheme?: string | null;
  logoFileId?: string | null;
  featurePermissions: FeaturePermissionType[];
 
@@ -28,6 +29,7 @@ class Organization {
  this.description = params.description;
  this.logoFileId = params.logoFileId;
  this.featurePermissions = params.featurePermissions;
+ this.colorScheme = params.colorScheme;
  }
 }
 

src/graphql/organizations/resolvers/Mutation/createOrganization.ts

@@ -2,7 +2,7 @@ import type { MutationResolvers } from "./../../../types.generated.js";
 export const createOrganization: NonNullable<
  MutationResolvers["createOrganization"]
 > = async (_parent, { data }, ctx) => {
- const { name, description, featurePermissions } = data;
+ const { name, description, featurePermissions, colorScheme } = data;
  ctx.log.info(
  { name, description, featurePermissions },
  "Creating organization",
@@ -11,6 +11,7 @@ export const createOrganization: NonNullable<
  name,
  description,
  featurePermissions,
+ colorScheme,
  });
  return {
  organization,

src/graphql/organizations/resolvers/Mutation/updateOrganization.ts

@@ -2,13 +2,15 @@ import type { MutationResolvers } from "./../../../types.generated.js";
 export const updateOrganization: NonNullable<
  MutationResolvers["updateOrganization"]
 > = async (_parent, { data }, ctx) => {
- const { id, name, description, featurePermissions, logoFileId } = data;
+ const { id, name, description, featurePermissions, logoFileId, colorScheme } =
+ data;
 
  const organization = await ctx.organizations.organizations.update(ctx, id, {
  name,
  description,
  featurePermissions,
  logoFileId,
+ colorScheme,
  });
  return { organization };
 };

src/graphql/organizations/resolvers/Mutation/updateRole.ts

@@ -0,0 +1,16 @@
+import type { MutationResolvers } from "./../../../types.generated.js";
+export const updateRole: NonNullable<MutationResolvers["updateRole"]> = async (
+ _parent,
+ { data },
+ ctx,
+) => {
+ const result = await ctx.organizations.members.updateRole(ctx, {
+ memberId: data.memberId,
+ newRole: data.role,
+ });
+
+ if (!result.ok) {
+ throw result.error;
+ }
+ return result.data;
+};

src/graphql/organizations/resolvers/Mutation/updateRole.unit.test.ts

@@ -0,0 +1,84 @@
+import { faker } from "@faker-js/faker";
+import { InternalServerError } from "~/domain/errors.js";
+import {
+ OrganizationMember,
+ OrganizationRole,
+} from "~/domain/organizations.js";
+import { createMockApolloServer } from "~/graphql/test-clients/mock-apollo-server.js";
+import { graphql } from "~/graphql/test-clients/unit/gql.js";
+import { Result } from "~/lib/result.js";
+
+describe("Organiation mutations", () => {
+ describe("updateRole", () => {
+ it("updates a role", async () => {
+ const { client, organizationService } = createMockApolloServer();
+
+ organizationService.members.updateRole.mockResolvedValue({
+ ok: true,
+ data: {
+ member: new OrganizationMember({
+ id: faker.string.uuid(),
+ role: OrganizationRole.ADMIN,
+ organizationId: faker.string.uuid(),
+ userId: faker.string.uuid(),
+ }),
+ },
+ });
+
+ const { errors, data } = await client.mutate({
+ mutation: graphql(`
+ mutation UpdateRole($data: UpdateRoleInput!) {
+ updateRole(data: $data) {
+ member {
+ id
+ }
+ }
+ }
+ `),
+ variables: {
+ data: {
+ memberId: faker.string.uuid(),
+ role: OrganizationRole.ADMIN,
+ },
+ },
+ });
+
+ expect(errors).toBeUndefined();
+ expect(data).toEqual({
+ updateRole: {
+ member: {
+ id: expect.any(String),
+ },
+ },
+ });
+ });
+
+ it("throws on error", async () => {
+ const { client, organizationService } = createMockApolloServer();
+
+ organizationService.members.updateRole.mockResolvedValue(
+ Result.error(new InternalServerError("")),
+ );
+
+ const { errors } = await client.mutate({
+ mutation: graphql(`
+ mutation UpdateRole($data: UpdateRoleInput!) {
+ updateRole(data: $data) {
+ member {
+ id
+ }
+ }
+ }
+ `),
+ variables: {
+ data: {
+ memberId: faker.string.uuid(),
+ role: OrganizationRole.ADMIN,
+ },
+ },
+ });
+
+ expect(errors).toBeDefined();
+ });
+ });
+});

src/graphql/organizations/resolvers/UpdateRoleResponse.ts

@@ -0,0 +1,4 @@
+import type { UpdateRoleResponseResolvers } from "./../../types.generated.js";
+export const UpdateRoleResponse: UpdateRoleResponseResolvers = {
+ /* Implement UpdateRoleResponse resolver logic here */
+};

src/graphql/organizations/schema.graphql

@@ -34,6 +34,11 @@ type Mutation {
  Remove a member from the organization by the ID of the membership.
  """
  removeMember(data: RemoveMemberInput!): RemoveMemberResponse!
+
+ """
+ Change the role of a member in the organization
+ """
+ updateRole(data: UpdateRoleInput!): UpdateRoleResponse!
 }
 
 type Organization {
@@ -52,6 +57,10 @@ type Organization {
  events: [Event!]!
  listings: [Listing!]!
  logo: RemoteFile
+ """
+ The primary color (hex) for the organization, for example: #FF0000 for red.
+ """
+ colorScheme: String
 }
 
 type Member {
@@ -86,6 +95,21 @@ enum Role {
  MEMBER
 }
 
+input UpdateRoleInput {
+ """
+ The ID of the member to change the role of
+ """
+ memberId: ID!
+ """
+ The new role of the member
+ """
+ role: Role!
+}
+
+type UpdateRoleResponse {
+ member: Member!
+}
+
 input UpdateOrganizationInput {
  """
  The ID of the organization to update
@@ -107,6 +131,10 @@ input UpdateOrganizationInput {
  """
  featurePermissions: [FeaturePermission!]
  logoFileId: ID
+ """
+ The primary color (hex) for the organization, for example: #FF0000 for red.
+ """
+ colorScheme: String
 }
 
 type UpdateOrganizationResponse {
@@ -127,6 +155,10 @@ input CreateOrganizationInput {
  Requires that the current user is a super user, otherwise, this field is ignored.
  """
  featurePermissions: [FeaturePermission!]
+ """
+ The primary color (hex) for the organization, for example: #FF0000 for red.
+ """
+ colorScheme: String
 }
 
 type CreateOrganizationResponse {

src/lib/server.ts

@@ -98,6 +98,7 @@ interface IOrganizationService {
  name: string;
  description?: string | null;
  featurePermissions?: FeaturePermissionType[] | null;
+ colorScheme?: string | null;
  },
  ): Promise<Organization>;
  update(
@@ -108,6 +109,7 @@ interface IOrganizationService {
  description: string | null;
  featurePermissions: FeaturePermissionType[] | null;
  logoFileId: string | null;
+ colorScheme: string | null;
  }>,
  ): Promise<Organization>;
  get(id: string): Promise<Organization>;
@@ -149,6 +151,17 @@ interface IOrganizationService {
  { members: OrganizationMember[] },
  PermissionDeniedError | UnauthorizedError
  >;
+ updateRole(
+ ctx: Context,
+ params: { memberId: string; newRole: OrganizationRoleType },
+ ): ResultAsync<
+ { member: OrganizationMember },
+ | PermissionDeniedError
+ | UnauthorizedError
+ | InternalServerError
+ | InvalidArgumentErrorV2
+ | NotFoundError
+ >;
  };
  permissions: {
  hasFeaturePermission(