@optimatech88/titomeet-shared-lib 1.0.5 → 1.0.7

package/.github/workflows/npm-publish.yml

@@ -1,34 +1,34 @@
-# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
-# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
-
-name: Node.js Package
-
-on:
-  push:
-    branches:
-      - main # Or your main branch
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - run: npm ci
-      #- run: npm test
-
-  publish-npm:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          registry-url: https://registry.npmjs.org/
-      - run: npm ci
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
+
+name: Node.js Package
+
+on:
+  push:
+    branches:
+      - main # Or your main branch
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - run: npm ci
+      - run: npm run build
+
+  publish-npm:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          registry-url: https://registry.npmjs.org/
+      - run: npm ci
+      - run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

package/.prettierrc

@@ -1,5 +1,5 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all",
-  "endOfLine":"auto"
+{
+  "singleQuote": true,
+  "trailingComma": "all",
+  "endOfLine":"auto"
 }

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@optimatech88/titomeet-shared-lib",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "nest build",
-    "format": "prettier --write \"src/**/*.ts\""
+    "format": "prettier --write \"src/**/*.ts\"",
+    "generate": "npx prisma generate"
   },
   "keywords": [],
   "author": "",
@@ -31,6 +32,7 @@
     "nestjs-seeder": "^0.3.2"
   },
   "devDependencies": {
+    "@nestjs/cli": "^11.0.5",
     "@types/express": "^4.17.21",
     "@types/node": "^22.2.0",
     "prettier": "^3.3.3",

package/prisma/schema.prisma

@@ -40,6 +40,7 @@ model User {
   participatedEvents Participant[]
   notificationsReceived Notification[] @relation("NotificationRecipient")
   notificationsSent Notification[] @relation("NotificationSender")
+  providers Provider[]
 }
 
 model Account {
@@ -79,6 +80,16 @@ enum EventStatus {
   PUBLISHED
 }
 
+model EventCategory {
+  id String @id @default(cuid())
+  name String
+  description String?
+  events Event[]
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+}
+
 model Event {
   id          String         @id @default(cuid())
   name        String
@@ -98,6 +109,8 @@ model Event {
   chat   Chat?    // Optional one-to-one relation
   status      EventStatus    @default(DRAFT)
 
+  categories EventCategory[]
+
   address     Address       @relation(fields: [addressId], references: [id])
   addressId   String
 
@@ -107,6 +120,8 @@ model Event {
   // Add participants relation
   participants Participant[]
 
+  providers Provider[]
+
   createdAt   DateTime      @default(now())
   updatedAt   DateTime      @updatedAt
 }
@@ -183,6 +198,29 @@ model Notification {
   read Boolean @default(false)
   data Json?
 
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+}
+
+enum ProviderStatus {
+  PENDING
+  APPROVED
+  REJECTED
+}
+
+model Provider {
+  id String @id @default(cuid())
+  name String
+  description String?
+  image String?
+
+  user User @relation(fields: [userId], references: [id])
+  userId String
+
+  events Event[]
+
+  status ProviderStatus @default(PENDING)
+
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 }

package/src/auth/admin.middleware.ts

@@ -0,0 +1,20 @@
+import { Injectable, NestMiddleware, UnauthorizedException } from '@nestjs/common';
+import { Request, Response, NextFunction } from 'express';
+import { UserRole, User } from '@prisma/client';
+
+interface RequestWithUser extends Request {
+  user?: User;
+}
+
+@Injectable()
+export class AdminMiddleware implements NestMiddleware {
+  use(req: RequestWithUser, res: Response, next: NextFunction) {
+    const user = req.user;
+
+    if (!user || !user.role?.includes(UserRole.ADMIN)) {
+      throw new UnauthorizedException('Access denied. Admins only.');
+    }
+
+    next();
+  }
+}

package/src/auth/auth.guard.ts

@@ -1,96 +1,98 @@
-import {
-  CanActivate,
-  ExecutionContext,
-  Injectable,
-  UnauthorizedException,
-} from '@nestjs/common';
-import { JwtService } from '@nestjs/jwt';
-import { PrismaClient } from '@prisma/client';
-import { Request } from 'express';
-import { IncomingHttpHeaders } from 'http';
-
-@Injectable()
-export class AuthGuard implements CanActivate {
-  private prisma: PrismaClient;
-
-  constructor(
-    private jwtService: JwtService,
-  ) {
-    this.prisma = new PrismaClient();
-  }
-
-  async canActivate(context: ExecutionContext): Promise<boolean> {
-    const request = context.switchToHttp().getRequest();
-    const token = this.extractTokenFromHeader(request);
-    if (!token) {
-      throw new UnauthorizedException();
-    }
-    try {
-      const payload = (await this.jwtService.verifyAsync(token)) as {
-        userId: string;
-      };
-
-      const user = await this.prisma.user.findUnique({
-        where: { id: payload.userId }
-      });
-
-      if (!user) {
-        throw new UnauthorizedException();
-      }
-
-      request['user'] = user;
-    } catch {
-      throw new UnauthorizedException();
-    }
-    return true;
-  }
-
-  private extractTokenFromHeader(request: Request & { headers: IncomingHttpHeaders }): string | undefined {
-    const [type, token] = request.headers.authorization?.split(' ') ?? [];
-    return type === 'Bearer' ? token : undefined;
-  }
-}
-
-@Injectable()
-export class OptionalAuthGuard implements CanActivate {
-   private prisma: PrismaClient;
-
-  constructor(
-    private jwtService: JwtService,
-  ) {
-    this.prisma = new PrismaClient();
-  }
-
-  async canActivate(context: ExecutionContext): Promise<boolean> {
-    const request = context.switchToHttp().getRequest();
-    const token = this.extractTokenFromHeader(request);
-    if (!token) {
-      return true;
-    }
-    try {
-      const payload = (await this.jwtService.verifyAsync(token)) as {
-        userId: string;
-      };
-
-      const user = await this.prisma.user.findUnique({
-        where: { id: payload.userId }
-      });
-
-      if (!user) {
-        throw new UnauthorizedException();
-      }
-
-      request['user'] = user;
-
-      // Continue without setting user
-    } catch {
-      // Continue without setting user
-    }
-    return true;
-  }
-
-  private extractTokenFromHeader(request: Request & { headers: IncomingHttpHeaders }): string | undefined {
-    const [type, token] = request.headers.authorization?.split(' ') ?? [];
-    return type === 'Bearer' ? token : undefined;
-  }
-}
+import {
+  CanActivate,
+  ExecutionContext,
+  Injectable,
+  UnauthorizedException,
+} from '@nestjs/common';
+import { JwtService } from '@nestjs/jwt';
+import { PrismaClient } from '@prisma/client';
+import { Request } from 'express';
+import { IncomingHttpHeaders } from 'http';
+
+@Injectable()
+export class AuthGuard implements CanActivate {
+  private prisma: PrismaClient;
+
+  constructor(
+    private jwtService: JwtService,
+  ) {
+    this.prisma = new PrismaClient();
+  }
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest();
+    const token = this.extractTokenFromHeader(request);
+    if (!token) {
+      throw new UnauthorizedException();
+    }
+    try {
+      const payload = (await this.jwtService.verifyAsync(token)) as {
+        userId: string;
+      };
+
+      const user = await this.prisma.user.findUnique({
+        where: { id: payload.userId }
+      });
+
+      if (!user) {
+        throw new UnauthorizedException();
+      }
+
+      request['user'] = user;
+    } catch {
+      throw new UnauthorizedException();
+    }
+    return true;
+  }
+
+  private extractTokenFromHeader(request: Request & { headers: IncomingHttpHeaders }): string | undefined {
+    const [type, token] = request.headers.authorization?.split(' ') ?? [];
+    return type === 'Bearer' ? token : undefined;
+  }
+}
+
+//optional auth guard
+@Injectable()
+export class OptionalAuthGuard implements CanActivate {
+   private prisma: PrismaClient;
+
+  constructor(
+    private jwtService: JwtService,
+  ) {
+    this.prisma = new PrismaClient();
+  }
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest();
+    const token = this.extractTokenFromHeader(request);
+    if (!token) {
+      return true;
+    }
+    try {
+      const payload = (await this.jwtService.verifyAsync(token)) as {
+        userId: string;
+      };
+
+      const user = await this.prisma.user.findUnique({
+        where: { id: payload.userId }
+      });
+
+      if (!user) {
+        throw new UnauthorizedException();
+      }
+
+      request['user'] = user;
+
+      // Continue without setting user
+    } catch {
+      // Continue without setting user
+    }
+    return true;
+  }
+
+  private extractTokenFromHeader(request: Request & { headers: IncomingHttpHeaders }): string | undefined {
+    const [type, token] = request.headers.authorization?.split(' ') ?? [];
+    return type === 'Bearer' ? token : undefined;
+  }
+}
+

package/src/auth/auth.module.ts

@@ -1,24 +1,24 @@
-import { Module, DynamicModule, Global } from '@nestjs/common';
-import { JwtModule } from '@nestjs/jwt';
-
-export interface AuthModuleOptions {
-  jwtSecret: string;
-  jwtExpiresIn?: string | number;
-}
-
-@Global()
-@Module({})
-export class AuthModule {
-  static forRoot(options: AuthModuleOptions): DynamicModule {
-    return {
-      module: AuthModule,
-      imports: [
-        JwtModule.register({
-          secret: options.jwtSecret,
-          signOptions: { expiresIn: options.jwtExpiresIn || '7d' },
-        }),
-      ],
-      exports: [JwtModule],
-    };
-  }
-}
+import { Module, DynamicModule, Global } from '@nestjs/common';
+import { JwtModule } from '@nestjs/jwt';
+
+export interface AuthModuleOptions {
+  jwtSecret: string;
+  jwtExpiresIn?: string | number;
+}
+
+@Global()
+@Module({})
+export class AuthModule {
+  static forRoot(options: AuthModuleOptions): DynamicModule {
+    return {
+      module: AuthModule,
+      imports: [
+        JwtModule.register({
+          secret: options.jwtSecret,
+          signOptions: { expiresIn: options.jwtExpiresIn || '7d' },
+        }),
+      ],
+      exports: [JwtModule],
+    };
+  }
+}

package/src/cache/cache.module.ts

@@ -1,25 +1,25 @@
-import { Module, DynamicModule, Global } from '@nestjs/common';
-import { Cacheable } from 'cacheable';
-import { CacheService } from './cache.service';
-import KeyvRedis from '@keyv/redis';
-
-@Global()
-@Module({})
-export class CacheModule {
-  static forRoot(redisUrl: string): DynamicModule {
-    return {
-      module: CacheModule,
-      providers: [
-        {
-          provide: 'CACHE_INSTANCE',
-          useFactory: () => {
-            const secondary = new KeyvRedis(redisUrl);
-            return new Cacheable({ secondary, ttl: '1h' });
-          },
-        },
-        CacheService,
-      ],
-      exports: ['CACHE_INSTANCE', CacheService],
-    };
-  }
-}
+import { Module, DynamicModule, Global } from '@nestjs/common';
+import { Cacheable } from 'cacheable';
+import { CacheService } from './cache.service';
+import KeyvRedis from '@keyv/redis';
+
+@Global()
+@Module({})
+export class CacheModule {
+  static forRoot(redisUrl: string): DynamicModule {
+    return {
+      module: CacheModule,
+      providers: [
+        {
+          provide: 'CACHE_INSTANCE',
+          useFactory: () => {
+            const secondary = new KeyvRedis(redisUrl);
+            return new Cacheable({ secondary, ttl: '1h' });
+          },
+        },
+        CacheService,
+      ],
+      exports: ['CACHE_INSTANCE', CacheService],
+    };
+  }
+}

package/src/cache/cache.service.ts

@@ -1,19 +1,19 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { Cacheable } from 'cacheable';
-
-@Injectable()
-export class CacheService<T> {
-  constructor(@Inject('CACHE_INSTANCE') private readonly cache: Cacheable) {}
-
-  async get<T>(key: string): Promise<T> {
-    return await this.cache.get(key);
-  }
-
-  async set(key: string, value: T, ttl?: number | string): Promise<void> {
-    await this.cache.set(key, value, ttl);
-  }
-
-  async delete(key: string): Promise<void> {
-    await this.cache.delete(key);
-  }
-}
+import { Inject, Injectable } from '@nestjs/common';
+import { Cacheable } from 'cacheable';
+
+@Injectable()
+export class CacheService<T> {
+  constructor(@Inject('CACHE_INSTANCE') private readonly cache: Cacheable) {}
+
+  async get<T>(key: string): Promise<T> {
+    return await this.cache.get(key);
+  }
+
+  async set(key: string, value: T, ttl?: number | string): Promise<void> {
+    await this.cache.set(key, value, ttl);
+  }
+
+  async delete(key: string): Promise<void> {
+    await this.cache.delete(key);
+  }
+}

package/src/index.ts

@@ -1,21 +1,30 @@
-export * from './auth/auth.guard';
-export { PrismaClient, User, Account, UserRole, Event, EventAccess, EventVisibility, EventStatus, EventPrice, Address, Participant, ParticipantStatus } from '@prisma/client';
-
-//auth
-export * from './auth/auth.guard';
-export * from './auth/auth.module';
-
-//cache
-export * from './cache/cache.module';
-export * from './cache/cache.service';
-
-//prisma
-export * from './prisma/prisma.module';
-export * from './prisma/prisma.service';
-
-export * from './types';
-export * from './utils';
-export * from './utils/api/endpoints';
-export * from './utils/events';
-
+export * from './auth/auth.guard';
+export { 
+    PrismaClient, User, Account, 
+        UserRole, Event, EventAccess, 
+        EventVisibility, EventStatus, 
+        EventPrice, Address, Participant, 
+        ParticipantStatus, 
+        Provider, 
+        ProviderStatus,
+        EventCategory
+    } from '@prisma/client';
+
+//auth
+export * from './auth/auth.guard';
+export * from './auth/auth.module';
+
+//cache
+export * from './cache/cache.module';
+export * from './cache/cache.service';
+
+//prisma
+export * from './prisma/prisma.module';
+export * from './prisma/prisma.service';
+
+export * from './types';
+export * from './utils';
+export * from './utils/api/endpoints';
+export * from './utils/events';
+
 export { JwtService } from "@nestjs/jwt";

package/src/prisma/prisma.module.ts

@@ -1,9 +1,9 @@
-import { Module, Global } from '@nestjs/common';
-import { PrismaService } from './prisma.service';
-
-@Global()
-@Module({
-  providers: [PrismaService],
-  exports: [PrismaService],
-})
-export class PrismaModule {}
+import { Module, Global } from '@nestjs/common';
+import { PrismaService } from './prisma.service';
+
+@Global()
+@Module({
+  providers: [PrismaService],
+  exports: [PrismaService],
+})
+export class PrismaModule {}

package/src/prisma/prisma.service.ts

@@ -1,13 +1,13 @@
-import { Injectable, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
-import { PrismaClient } from '@prisma/client';
-
-@Injectable()
-export class PrismaService extends PrismaClient implements OnModuleInit, OnModuleDestroy {
-  async onModuleInit() {
-    await this.$connect();
-  }
-
-  async onModuleDestroy() {
-    await this.$disconnect();
-  }
-}
+import { Injectable, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
+import { PrismaClient } from '@prisma/client';
+
+@Injectable()
+export class PrismaService extends PrismaClient implements OnModuleInit, OnModuleDestroy {
+  async onModuleInit() {
+    await this.$connect();
+  }
+
+  async onModuleDestroy() {
+    await this.$disconnect();
+  }
+}

package/src/types/index.ts

@@ -1,12 +1,12 @@
-export interface PaginatedData<T> {
-  items: T[];
-  total: number;
-  page: number;
-  limit: number;
-  totalPages: number;
-}
-
-export interface PaginationQuery {
-  page?: string;
-  limit?: string;
-}
+export interface PaginatedData<T> {
+  items: T[];
+  total: number;
+  page: number;
+  limit: number;
+  totalPages: number;
+}
+
+export interface PaginationQuery {
+  page?: string;
+  limit?: string;
+}

package/src/utils/api/endpoints.ts

@@ -1,7 +1,7 @@
-export const CHAT_API_URL: string = "api/chats"
-export const PROPERTIES_API_URL: string = "api/properties"
-
-export const API_ENDPOINTS = {
-  CHAT: 'api/chats',
-  PROPERTIES_API_URL: 'api/properties',
+export const CHAT_API_URL: string = "api/chats"
+export const PROPERTIES_API_URL: string = "api/properties"
+
+export const API_ENDPOINTS = {
+  CHAT: 'api/chats',
+  PROPERTIES_API_URL: 'api/properties',
 }