✨ Patch and create organizations

Author: AnandChowdhary

src/interfaces/enum.ts

@@ -1,4 +1,5 @@
 export enum MembershipRole {
+  OWNER = 1,
   ADMIN = 2,
   MANAGER = 3,
   MEMBER = 4,

src/interfaces/tables/organization.ts

@@ -1,7 +1,7 @@
 export interface Organization {
-  id: number;
+  id?: number;
   name?: string;
   invitationDomain?: string;
-  createdAt: Date;
-  updatedAt: Date;
+  createdAt?: Date;
+  updatedAt?: Date;
 }

src/rest/auth.ts

@@ -46,7 +46,8 @@ export const login = async (
 export const register = async (
   user: User,
   email?: string,
-  organizationId?: number
+  organizationId?: number,
+  role?: MembershipRole
 ) => {
   // Create user
   const result = <InsertResult>await createUser(user);
@@ -61,11 +62,11 @@ export const register = async (
     await updateUser(userId, { primaryEmail: emailId });
     await sendEmailVerification(emailId, email, user);
   }
-  if (organizationId) {
+  if (organizationId && role) {
     await createMembership({
       userId,
       organizationId,
-      role: MembershipRole.ADMIN
+      role
     });
   }
   return { created: true };

src/rest/organization.ts

@@ -0,0 +1,58 @@
+import { Organization } from "../interfaces/tables/organization";
+import { createOrganization, updateOrganization } from "../crud/organization";
+import { InsertResult } from "../interfaces/mysql";
+import { createMembership, getUserOrganizationId } from "../crud/membership";
+import {
+  MembershipRole,
+  ErrorCode,
+  UserRole,
+  EventType
+} from "../interfaces/enum";
+import { getUser } from "../crud/user";
+import { createEvent } from "../crud/event";
+import { Locals } from "../interfaces/general";
+
+export const newOrganizationForUser = async (
+  userId: number,
+  organization: Organization,
+  locals: Locals
+) => {
+  const org = <InsertResult>await createOrganization(organization);
+  await createMembership({
+    organizationId: org.insertId,
+    userId,
+    role: MembershipRole.OWNER
+  });
+  await createEvent(
+    {
+      userId,
+      type: EventType.ORGANIZATION_CREATED,
+      data: { id: org.insertId }
+    },
+    locals
+  );
+  return;
+};
+
+export const updateOrganizationForUser = async (
+  userId: number,
+  organizationId: number,
+  data: Organization,
+  locals: Locals
+) => {
+  const user = await getUser(userId);
+  const userOrganizationId = await getUserOrganizationId(user);
+  if (organizationId == userOrganizationId || user.role == UserRole.ADMIN) {
+    await updateOrganization(organizationId, data);
+    await createEvent(
+      {
+        userId,
+        type: EventType.ORGANIZATION_UPDATED,
+        data: { id: organizationId, data }
+      },
+      locals
+    );
+    return;
+  }
+  throw new Error(ErrorCode.INSUFFICIENT_PERMISSION);
+};

src/routes/index.ts

@@ -1,8 +1,8 @@
 import { Application } from "express";
 import asyncHandler from "express-async-handler";
-import { routeUserMe, routeUserPut, routeUserId } from "./users";
+import { routeUserPut, routeUserId } from "./users";
 import { routeEmailVerify, routeEmailAdd, routeEmailDelete } from "./emails";
-import { routeOrganizationCreate } from "./organizations";
+import { routeOrganizationCreate, routeOrganizationUpdate } from "./organizations";
 import { authHandler } from "../helpers/middleware";
 import {
   routeAuthVerifyToken,
@@ -36,7 +36,6 @@ const routesAuth = (app: Application) => {
 };
 
 const routesUser = (app: Application) => {
-  app.get("/users/me", authHandler, asyncHandler(routeUserMe));
   app.get("/users/:id", authHandler, asyncHandler(routeUserId));
   app.put("/users", asyncHandler(routeUserPut));
 };
@@ -49,4 +48,5 @@ const routesEmail = (app: Application) => {
 
 const routesOrganization = (app: Application) => {
   app.put("/organizations", authHandler, asyncHandler(routeOrganizationCreate));
+  app.patch("/organizations/:id", authHandler, asyncHandler(routeOrganizationUpdate));
 };

src/routes/organizations.ts

@@ -1,5 +1,29 @@
 import { Request, Response } from "express";
+import {
+  newOrganizationForUser,
+  updateOrganizationForUser
+} from "../rest/organization";
+import { ErrorCode } from "../interfaces/enum";
 
 export const routeOrganizationCreate = async (req: Request, res: Response) => {
+  const name = req.body.name;
+  const invitationDomain = req.body.invitationDomain;
+  await newOrganizationForUser(
+    res.locals.token.id,
+    { name, invitationDomain },
+    res.locals
+  );
+  res.json({ success: true });
+};
+
+export const routeOrganizationUpdate = async (req: Request, res: Response) => {
+  const id = req.params.id;
+  if (!id) throw new Error(ErrorCode.MISSING_FIELD);
+  await updateOrganizationForUser(
+    res.locals.token.id,
+    id,
+    req.body,
+    res.locals
+  );
   res.json({ success: true });
 };

src/routes/users.ts

@@ -1,15 +1,11 @@
 import { Request, Response } from "express";
 import { register } from "../rest/auth";
-import { getUser } from "../crud/user";
 import { getUserFromId } from "../rest/user";
 import { ErrorCode } from "../interfaces/enum";
 
-export const routeUserMe = async (req: Request, res: Response) => {
-  res.json({ user: await getUser(res.locals.token.id) });
-};
-
 export const routeUserId = async (req: Request, res: Response) => {
-  const id = req.body.id || req.params.id;
+  let id = req.body.id || req.params.id;
+  if (id === "me") id = res.locals.token.id;
   if (!id) throw new Error(ErrorCode.MISSING_FIELD);
   res.json({ user: await getUserFromId(id, res.locals.token.id) });
 };