Release 1.0.0

.env.example

@@ -29,4 +29,5 @@ PHARMATECH_SENDER="Andy de Pharmatech <notifications@pharmatech.site>"
 # Resemd
 RESEND_API_KEY=
 
-ADMIN_PASSWORD=
+ADMIN_PASSWORD=
+ADMIN_EMAIL=

package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "0.5.0",
+  "version": "1.0.0",
   "description": "",
   "author": "",
   "private": true,
@@ -19,6 +19,7 @@
     "test:watch": "vitest run --watch --config vitest.config.ts",
     "test:coverage": "vitest run --coverage.enabled --coverage.all --config vitest.config.ts",
     "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js",
+    "migration:create": "npm run typeorm -- migration:create",
     "migration:generate": "npm run typeorm -- migration:generate -d ./src/database/typeorm.config.ts",
     "migration:run": "npm run typeorm -- migration:run -d ./src/database/typeorm.config.ts",
     "migration:revert": "npm run typeorm -- migration:revert -d ./src/database/typeorm.config.ts",

src/active-principle/active-principle.controller.ts

@@ -0,0 +1,66 @@
+import {
+  Controller,
+  Get,
+  Query,
+  UseGuards,
+  UseInterceptors,
+  HttpStatus,
+} from '@nestjs/common';
+import { ActivePrincipleService } from './active-principle.service';
+import { RolesGuard } from 'src/auth/roles.guard';
+import { AuthGuard } from 'src/auth/auth.guard';
+import { Roles } from 'src/auth/roles.decorador';
+import { UserRole } from 'src/user/entities/user.entity';
+import { PaginationInterceptor } from 'src/utils/pagination.interceptor';
+import { PaginationQueryDTO } from 'src/utils/dto/pagination.dto';
+import { Pagination } from 'src/utils/pagination.decorator';
+import {
+  ApiOperation,
+  ApiQuery,
+  ApiResponse,
+  getSchemaPath,
+} from '@nestjs/swagger';
+import { ResponseActivePrincipleDTO } from './dto/active-principle.dto';
+import { PaginationDTO } from 'src/utils/dto/pagination.dto';
+
+@Controller('active-principle')
+export class ActivePrincipleController {
+  constructor(
+    private readonly activePrincipleService: ActivePrincipleService,
+  ) {}
+
+  @UseGuards(AuthGuard, RolesGuard)
+  @Roles(UserRole.ADMIN)
+  @Get()
+  @UseInterceptors(PaginationInterceptor)
+  @ApiOperation({ summary: 'List active principles' })
+  @ApiQuery({ name: 'q', required: false, description: 'Search term' })
+  @ApiQuery({ name: 'page', required: false, type: Number, example: 1 })
+  @ApiQuery({ name: 'limit', required: false, type: Number, example: 10 })
+  @ApiResponse({
+    description: 'Successful retrieval',
+    status: HttpStatus.OK,
+    schema: {
+      allOf: [
+        { $ref: getSchemaPath(PaginationDTO) },
+        {
+          properties: {
+            results: {
+              type: 'array',
+              items: { $ref: getSchemaPath(ResponseActivePrincipleDTO) },
+            },
+          },
+        },
+      ],
+    },
+  })
+  async findAll(
+    @Pagination() pagination: PaginationQueryDTO,
+    @Query('q') q?: string,
+  ): Promise<{ data: ResponseActivePrincipleDTO[]; total: number }> {
+    const { page, limit } = pagination;
+    const data = await this.activePrincipleService.findAll(page, limit, q);
+    const total = await this.activePrincipleService.countActivePrinciples(q);
+    return { data, total };
+  }
+}

src/active-principle/active-principle.module.ts

@@ -0,0 +1,13 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { ActivePrinciple } from './entities/active-principle.entity';
+import { ActivePrincipleController } from './active-principle.controller';
+import { ActivePrincipleService } from './active-principle.service';
+import { AuthModule } from 'src/auth/auth.module';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([ActivePrinciple]), AuthModule],
+  controllers: [ActivePrincipleController],
+  providers: [ActivePrincipleService],
+})
+export class ActivePrincipleModule {}

src/active-principle/active-principle.service.ts

@@ -0,0 +1,30 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository, ILike } from 'typeorm';
+import { ActivePrinciple } from './entities/active-principle.entity';
+
+@Injectable()
+export class ActivePrincipleService {
+  constructor(
+    @InjectRepository(ActivePrinciple)
+    private readonly activePrincipleRepository: Repository<ActivePrinciple>,
+  ) {}
+
+  async findAll(
+    page: number,
+    limit: number,
+    q?: string,
+  ): Promise<ActivePrinciple[]> {
+    const where = q ? { name: ILike(`%${q}%`) } : {};
+    return await this.activePrincipleRepository.find({
+      where,
+      skip: (page - 1) * limit,
+      take: limit,
+    });
+  }
+
+  async countActivePrinciples(q?: string): Promise<number> {
+    const where = q ? { name: ILike(`%${q}%`) } : {};
+    return await this.activePrincipleRepository.count({ where });
+  }
+}

src/active-principle/dto/active-principle.dto.ts

@@ -0,0 +1,10 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { Expose } from 'class-transformer';
+import { IsString } from 'class-validator';
+
+export class ResponseActivePrincipleDTO {
+  @Expose()
+  @ApiProperty({ example: 'Acetaminophen' })
+  @IsString()
+  name: string;
+}

src/active-principle/entities/active-principle.entity.ts

@@ -0,0 +1,8 @@
+import { BaseModel } from 'src/utils/entity';
+import { Column, Entity } from 'typeorm';
+
+@Entity()
+export class ActivePrinciple extends BaseModel {
+  @Column({ type: 'varchar', length: 255 })
+  name: string;
+}

src/active-principle/migrations/1747107651171-add-active-principle-migration.ts

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddActivePrincipleMigration1747107651171
+  implements MigrationInterface
+{
+  name = 'AddActivePrincipleMigration1747107651171';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "active_principle" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "created_at" TIMESTAMP NOT NULL DEFAULT now(), "updated_at" TIMESTAMP NOT NULL DEFAULT now(), "deleted_at" TIMESTAMP, "name" character varying(255) NOT NULL, CONSTRAINT "PK_872c6d07a950a9ec64da5714eb6" PRIMARY KEY ("id"))`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE "active_principle"`);
+  }
+}

src/app.module.ts

@@ -22,6 +22,8 @@ import { CartModule } from './cart/cart.module';
 import { RecommendationModule } from './recommendation/recommendation.module';
 import { ReportsModule } from './reports/reports.module';
 import { EventEmitterModule } from '@nestjs/event-emitter';
+import { SalesModule } from './sales/sales.module';
+import { ActivePrincipleModule } from './active-principle/active-principle.module';
 
 @Module({
   imports: [
@@ -67,6 +69,8 @@ import { EventEmitterModule } from '@nestjs/event-emitter';
     CartModule,
     RecommendationModule,
     ReportsModule,
+    SalesModule,
+    ActivePrincipleModule,
   ],
   controllers: [AppController],
   providers: [AppService],

src/auth/auth.module.ts

@@ -7,10 +7,12 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
 import { UserService } from 'src/user/user.service';
 import { EmailModule } from 'src/email/email.module';
 import { AuthGuard } from './auth.guard';
+import { BranchModule } from 'src/branch/branch.module';
 
 @Module({
   imports: [
     forwardRef(() => UserModule),
+    forwardRef(() => BranchModule),
     ConfigModule,
     JwtModule.registerAsync({
       useFactory: (configService: ConfigService) => ({

src/auth/auth.service.ts

@@ -92,7 +92,10 @@ export class AuthService {
 
   async updatePassword(user: User, newPasswod: string): Promise<boolean> {
     const password = await this.encryptPassword(newPasswod);
-    await this.userService.update(user, { password });
+    await this.userService.update(user, {
+      password,
+      isGenericPassword: false,
+    });
     return true;
   }
 

src/branch/branch.module.ts

@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { BranchService } from './branch.service';
 import { BranchController } from './branch.controller';
 import { TypeOrmModule } from '@nestjs/typeorm';
@@ -14,9 +14,10 @@ import { State } from 'src/state/entities/state.entity';
 @Module({
   imports: [
     TypeOrmModule.forFeature([Branch, City, State, Country]),
-    AuthModule,
+    forwardRef(() => AuthModule),
   ],
   controllers: [BranchController],
   providers: [BranchService, CityService, StateService, CountryService],
+  exports: [BranchService],
 })
 export class BranchModule {}

src/branch/branch.service.ts

@@ -93,4 +93,20 @@ export class BranchService {
     });
     return deleted.affected === 1;
   }
+
+  async findNearestBranch(lat: number, lng: number): Promise<Branch> {
+    const branch = await this.branchRepository
+      .createQueryBuilder('branch')
+      .orderBy(
+        `ST_DistanceSphere(ST_MakePoint(branch.longitude, branch.latitude), ST_MakePoint(:lng, :lat))`,
+      )
+      .setParameters({ lat, lng })
+      .getOne();
+
+    if (!branch) {
+      throw new NotFoundException('No closer branch found');
+    }
+
+    return branch;
+  }
 }

src/branch/dto/branch.dto.ts

@@ -1,6 +1,13 @@
 import { ApiProperty, IntersectionType, PartialType } from '@nestjs/swagger';
-import { Expose } from 'class-transformer';
-import { IsNotEmpty, IsNumber, IsString, Max, Min } from 'class-validator';
+import { Expose, Type } from 'class-transformer';
+import {
+  IsNotEmpty,
+  IsNumber,
+  IsString,
+  IsUUID,
+  Max,
+  Min,
+} from 'class-validator';
 import { CityDTO } from 'src/city/dto/city.dto';
 import { BaseDTO } from 'src/utils/dto/base.dto';
 
@@ -36,6 +43,7 @@ class BranchDTO {
 
 export class CreateBranchDTO extends BranchDTO {
   @IsNotEmpty()
+  @IsUUID()
   @ApiProperty({ description: 'The city id of the branch' })
   cityId: string;
 }
@@ -44,6 +52,7 @@ export class UpdateBranchDTO extends PartialType(CreateBranchDTO) {}
 
 export class ResponseBranchDTO extends IntersectionType(BranchDTO, BaseDTO) {
   @Expose()
-  @ApiProperty({ description: 'The city of the branch' })
+  @ApiProperty({ description: 'The city of the branch', type: CityDTO })
+  @Type(() => CityDTO)
   city: CityDTO;
 }

src/database/database.module.ts

@@ -15,7 +15,6 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
         password: configService.get('POSTGRES_PASSWORD'),
         database: configService.get('POSTGRES_NAME'),
         entities: [__dirname + '/../**/*.entity{.ts,.js}'],
-        subscribers: [__dirname + '/../**/*.subscriber{.ts,.js}'],
         synchronize: false,
         ssl: configService.get<boolean>('POSTGRES_SSL', false),
       }),

src/database/migrations/1747014730112-enable-postgis-extension-migration.ts

@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class EnablePostgisExtensionMigration1747014730112
+  implements MigrationInterface
+{
+  name = 'EnablePostgisExtensionMigration1747014730112';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`CREATE EXTENSION IF NOT EXISTS postgis`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP EXTENSION IF EXISTS postgis`);
+  }
+}