feat #2/ deactivate invitation link

src/controllers/createorgController.ts

@@ -0,0 +1,24 @@
+import { NextFunction, Request, Response } from "express";
+import { OrganisationService } from "../services/createOrg.services";
+
+export const createOrganisation = async (req: Request, res: Response, next: NextFunction) => {
+  try {
+    const payload = req.body;
+    const user = req.user;
+    const userId = user.id;
+
+    const organisationService = new OrganisationService();
+    const newOrganisation = await organisationService.createOrganisation(payload, userId);
+
+    const respObj = {
+      status: "success",
+      message: "organisation created successfully",
+      data: newOrganisation,
+      status_code: 201
+    }
+
+    return res.status(201).json(respObj);
+  } catch (error) {
+    return next(error);
+  }
+}

src/index.ts

@@ -21,6 +21,7 @@ import { routeNotFound, errorHandler } from "./middleware";
 import { orgRouter } from "./routes/organisation";
 import swaggerUi from "swagger-ui-express";
 import swaggerSpec from "./swaggerConfig";
+import { organisationRoute } from "./routes/createOrg";
 
 dotenv.config();
 
@@ -45,7 +46,7 @@ server.use(express.json());
 server.get("/", (req: Request, res: Response) => {
   res.send("Hello world");
 });
-server.use("/api/v1", userRouter, orgRouter);
+server.use("/api/v1", userRouter, orgRouter, organisationRoute);
 server.use("/api/v1/auth", authRoute);
 server.use("/api/v1/help-center", helpRouter);
 server.use("/api/v1/sms", smsRouter);

src/models/organization.ts

@@ -1,5 +1,15 @@
-import { Entity, PrimaryGeneratedColumn, Column, ManyToMany, OneToMany } from "typeorm";
-import { User } from "./user";
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  OneToMany,
+  ManyToMany,
+  BeforeInsert,
+  UpdateDateColumn,
+} from "typeorm";
+import { User } from ".";
+import { v4 as uuidv4 } from "uuid";
+import { UserOrganization } from "./user-organisation";
 import ExtendedBaseEntity from "./extended-base-entity";
 import { OrganisationInvitation } from "./organisationInvitation";
 
@@ -8,15 +18,53 @@ export class Organization extends ExtendedBaseEntity {
   @PrimaryGeneratedColumn("uuid")
   id: string;
 
+  @Column({ unique: true })
+  slug: string;
+
   @Column()
   name: string;
 
-  @Column()
+  @Column({ nullable: true })
+  email: string;
+
+  @Column({ nullable: true })
+  industry: string;
+
+  @Column({ nullable: true })
+  type: string;
+
+  @Column({ nullable: true })
+  country: string;
+
+  @Column({ nullable: true })
+  address: string;
+
+  @Column({ nullable: true })
+  state: string;
+
+  @Column("text", { nullable: true })
   description: string;
 
+  @UpdateDateColumn()
+  created_at: Date;
+
+  @UpdateDateColumn()
+  updated_at: Date;
+
+  @Column("uuid")
+  owner_id: string;
+
+  @OneToMany(
+    () => UserOrganization,
+    (userOrganization) => userOrganization.organization
+  )
+  userOrganizations: UserOrganization[];
+
   @ManyToMany(() => User, (user) => user.organizations)
   users: User[];
 
-  @OneToMany(() => OrganisationInvitation, (invitation) => invitation.organization)
-  invitations: OrganisationInvitation[];
+  @BeforeInsert()
+  generateSlug() {
+    this.slug = uuidv4();
+  }
 }

src/models/user-organisation.ts

@@ -0,0 +1,28 @@
+import { Entity, ManyToOne, Column, PrimaryColumn, JoinColumn } from 'typeorm';
+import { User } from "./user";
+import { Organization } from "./organization";
+import { UserRole } from '../enums/userRoles';
+import ExtendedBaseEntity from './extended-base-entity';
+
+@Entity()
+export class UserOrganization extends ExtendedBaseEntity {
+    @PrimaryColumn()
+    userId: string;
+
+    @PrimaryColumn()
+    organizationId: string;
+
+    @ManyToOne(() => User, user => user.userOrganizations)
+    @JoinColumn({ name: 'userId' })
+    user: User;
+
+    @ManyToOne(() => Organization, organization => organization.userOrganizations)
+    @JoinColumn({ name: 'organizationId' })
+    organization: Organization;
+
+    @Column({
+      type: "enum",
+      enum: UserRole,
+    })
+    role: UserRole;
+}

src/models/user.ts

@@ -12,6 +12,7 @@ import {
   UpdateDateColumn,
 } from "typeorm";
 import { Profile, Product, Organization, Sms, Blog } from ".";
+import { UserOrganization } from "./user-organisation";
 import { IsEmail } from "class-validator";
 import ExtendedBaseEntity from "./extended-base-entity";
 import { getIsInvalidMessage } from "../utils";
@@ -62,6 +63,15 @@ export class User extends ExtendedBaseEntity {
   @OneToMany(() => Blog, (blog) => blog.author)
   blogs: Blog[];
 
+  @OneToMany(
+    () => UserOrganization,
+    (userOrganization) => userOrganization.user
+  )
+  userOrganizations: UserOrganization[];
+
+  @OneToMany(() => Sms, (sms) => sms.sender, { cascade: true })
+  sms: Sms[];
+
   @ManyToMany(() => Organization, (organization) => organization.users, {
     cascade: true,
   })

src/routes/createOrg.ts

@@ -0,0 +1,9 @@
+import { Router } from "express";
+import { authMiddleware } from "../middleware";
+import { createOrganisation } from "../controllers/createorgController"
+
+const organisationRoute = Router();
+
+organisationRoute.post("/organisations", authMiddleware, createOrganisation);
+
+export { organisationRoute }

src/services/createOrg.services.ts

@@ -0,0 +1,38 @@
+import AppDataSource from "../data-source";
+import { Organization, User } from "../models";
+import { UserRole } from "../enums/userRoles";
+import { ICreateOrganisation, IOrganisationService } from "../types";
+import { HttpError } from "../middleware";
+import { UserOrganization } from "../models/user-organisation";
+
+export class OrganisationService implements IOrganisationService {
+  public async createOrganisation(payload: ICreateOrganisation, userId: string): Promise<{
+    newOrganisation: Partial<Organization>;
+  }> {
+    try {
+      const organisation = new Organization();
+      organisation.owner_id = userId;
+      Object.assign(organisation, payload);
+
+      const newOrganisation = await AppDataSource.manager.save(organisation);
+
+      const userOrganization = new UserOrganization();
+      userOrganization.userId = userId;
+      userOrganization.organizationId = newOrganisation.id;
+      userOrganization.role = UserRole.ADMIN;
+
+      await AppDataSource.manager.save(userOrganization);
+
+      const user = await AppDataSource
+      .getRepository(User)
+      .findOne({ where: { id: userId }, relations: ["userOrganizations", "userOrganizations.organization"] });
+
+      user.userOrganizations.push(userOrganization);
+      await AppDataSource.getRepository(User).save(user);
+
+      return { newOrganisation };
+    } catch (error) {
+      throw new HttpError(error.status || 500, error.message || error);
+    }
+  }
+}

src/types/index.d.ts

@@ -34,8 +34,26 @@ export interface IAuthService {
   verifyEmail(token: string, otp: number): Promise<{ message: string }>;
 }
 
-// declare module "express-serve-static-core" {
-//   interface Request {
-//     user?: User;
-//   }
-// }
+export interface ICreateOrganisation {
+  name: string;
+  description: string;
+  email: string;
+  industry: string;
+  type: string;
+  country: string;
+  address: string;
+  state: string;
+}
+
+export interface IOrganisationService {
+  createOrganisation(
+    payload: ICreateOrganisation,
+    userId: string
+  ): Promise<unknown>;
+}
+
+declare module "express-serve-static-core" {
+  interface Request {
+    user?: User;
+  }
+}