yegara 1.0.26 → 1.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yegara",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "",
   "main": "./src/index.ts",
   "exports": {
@@ -17,14 +17,17 @@
   "dependencies": {
     "@nestjs-modules/mailer": "^2.0.2",
     "@nestjs/common": "^10.0.0",
+    "@nestjs/config": "^4.0.2",
     "@nestjs/core": "^10.0.0",
     "@nestjs/jwt": "10.2.0",
     "@nestjs/passport": "^10.0.3",
     "@nestjs/platform-express": "^10.0.0",
     "@nestjs/swagger": "^8.1.0",
     "@types/passport-jwt": "^4.0.1",
+    "bcrypt": "^6.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
+    "dotenv": "^17.2.3",
     "drizzle-orm": "^0.36.4",
     "express": "^4.21.2",
     "passport-jwt": "^4.0.1",

package/src/db/typeorm/audit.entity.ts

@@ -1,13 +1,13 @@
-import { CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Entity } from "typeorm";
-
-@Entity()
-export class Audit {
-    @CreateDateColumn({ type: "timestamp", default: () => "CURRENT_TIMESTAMP" })
-    createdAt: Date;
-
-    @UpdateDateColumn({ type: "timestamp", nullable: true })
-    updatedAt: Date;
-
-    @DeleteDateColumn({ type: "timestamp", nullable: true })
-    deletedAt: Date;
-}
+import { CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Entity } from "typeorm";
+
+@Entity()
+export class Audit {
+    @CreateDateColumn({ type: "timestamp", default: () => "CURRENT_TIMESTAMP" })
+    createdAt?: Date;
+
+    @UpdateDateColumn({ type: "timestamp", nullable: true })
+    updatedAt?: Date;
+
+    @DeleteDateColumn({ type: "timestamp", nullable: true })
+    deletedAt?: Date;
+}

package/src/db/typeorm/index.ts

@@ -1,3 +1,3 @@
-export * from './typeorm.config'
-export * from './typeorm.service'
+export * from './typeorm.config'
+export * from './typeorm.service'
 export * from './audit.entity'

package/src/db/typeorm/typeorm.config.ts

@@ -1,31 +1,31 @@
-import * as dotenv from 'dotenv'
-import { DataSource, DataSourceOptions } from 'typeorm';
-import { SeederOptions } from 'typeorm-extension';
-dotenv.config({ path: '.env' });
-
-
-const pathPrefix = '';
-
-export const typeormConfig = {
-    type: 'postgres',
-    host: process.env.DATABASE_HOST,
-    port: Number(process.env.DATABASE_PORT),
-    database: process.env.DATABASE_NAME,
-    username: process.env.DATABASE_USER,
-    password: process.env.DATABASE_PASSWORD,
-    schema: process.env.DATABASE_SCHEMA,
-    entities: [`${pathPrefix}dist/db/entities/**/*.entity.{ts,js}`],
-    migrations: [`${pathPrefix}dist/db/migrations/*.{ts,js}`],
-    subscribers: [`${pathPrefix}dist/db/subscribers/*.{ts,js}`],
-    migrationsRun: true,
-    seeds: [`${pathPrefix}dist/db/seeders/**.seeder.{ts,js}`],
-    migrationsTableName: 'typeorm_migrations',
-    logger: 'advanced-console',
-    logging: 'all',
-    synchronize: false,
-    autoLoadEntities: true,
-} as DataSourceOptions & SeederOptions;
-
-const dataSource = new DataSource(typeormConfig);
-
-export default dataSource;
+import * as dotenv from 'dotenv'
+import { DataSource, DataSourceOptions } from 'typeorm';
+import { SeederOptions } from 'typeorm-extension';
+dotenv.config({ path: '.env' });
+
+
+const pathPrefix = '';
+
+export const typeormConfig = {
+    type: 'postgres',
+    host: process.env.DATABASE_HOST,
+    port: Number(process.env.DATABASE_PORT),
+    database: process.env.DATABASE_NAME,
+    username: process.env.DATABASE_USER,
+    password: process.env.DATABASE_PASSWORD,
+    schema: process.env.DATABASE_SCHEMA,
+    entities: [`${pathPrefix}dist/db/entities/**/*.entity.{ts,js}`],
+    migrations: [`${pathPrefix}dist/db/migrations/*.{ts,js}`],
+    subscribers: [`${pathPrefix}dist/db/subscribers/*.{ts,js}`],
+    migrationsRun: true,
+    seeds: [`${pathPrefix}dist/db/seeders/**.seeder.{ts,js}`],
+    migrationsTableName: 'typeorm_migrations',
+    logger: 'advanced-console',
+    logging: 'all',
+    synchronize: false,
+    autoLoadEntities: true,
+} as DataSourceOptions & SeederOptions;
+
+const dataSource = new DataSource(typeormConfig);
+
+export default dataSource;

package/src/db/typeorm/typeorm.service.ts

@@ -1,18 +1,18 @@
-import { Injectable } from "@nestjs/common";
-import { TypeOrmDataSourceFactory, TypeOrmModuleOptions, TypeOrmOptionsFactory } from "@nestjs/typeorm";
-import { typeormConfig } from "./typeorm.config";
-import { SeederOptions } from "typeorm-extension";
-
-@Injectable()
-export class TypeOrmService implements TypeOrmOptionsFactory {
-    public createTypeOrmOptions(): TypeOrmModuleOptions & SeederOptions {
-        return typeormConfig;
-    }
-}
-
-@Injectable()
-export class TypeOrmConfigService implements TypeOrmOptionsFactory {
-    public createTypeOrmOptions(): TypeOrmModuleOptions & SeederOptions {
-        return typeormConfig;
-    }
-}
+import { Injectable } from "@nestjs/common";
+import { TypeOrmDataSourceFactory, TypeOrmModuleOptions, TypeOrmOptionsFactory } from "@nestjs/typeorm";
+import { typeormConfig } from "./typeorm.config";
+import { SeederOptions } from "typeorm-extension";
+
+@Injectable()
+export class TypeOrmService implements TypeOrmOptionsFactory {
+    public createTypeOrmOptions(): TypeOrmModuleOptions & SeederOptions {
+        return typeormConfig;
+    }
+}
+
+@Injectable()
+export class TypeOrmConfigService implements TypeOrmOptionsFactory {
+    public createTypeOrmOptions(): TypeOrmModuleOptions & SeederOptions {
+        return typeormConfig;
+    }
+}

package/src/dtos/language.dto.ts

@@ -1,20 +1,20 @@
-import { ApiProperty } from "@nestjs/swagger";
-import { IsNotEmpty, IsString } from "class-validator";
-
-export class LanguageDto {
-    @ApiProperty({
-        description: 'The language name',
-        example: 'English',
-    })
-    @IsNotEmpty()
-    @IsString()
-    en!: string;
-
-    @ApiProperty({
-        description: 'The language name in the native language',
-        example: 'አማርኛ',
-    })
-    @IsNotEmpty()
-    @IsString()
-    am!: string;
+import { ApiProperty } from "@nestjs/swagger";
+import { IsNotEmpty, IsString } from "class-validator";
+
+export class LanguageDto {
+    @ApiProperty({
+        description: 'The language name',
+        example: 'English',
+    })
+    @IsNotEmpty()
+    @IsString()
+    en!: string;
+
+    @ApiProperty({
+        description: 'The language name in the native language',
+        example: 'አማርኛ',
+    })
+    @IsNotEmpty()
+    @IsString()
+    am!: string;
 }

package/src/generics/drizzle/controllers/extra-crud.controller.ts

@@ -1,62 +1,62 @@
-import { Body, Controller, Delete, Get, Param, Post, Put, UseInterceptors } from "@nestjs/common";
-import { ApiBearerAuth, ApiBody } from "@nestjs/swagger";
-import { DExtraCrudService } from "../services/extra-crud.service";
-
-export type ExtraCrudOptions = {
-    createDto?: { new(): NonNullable<unknown> };
-    updateDto?: { new(): NonNullable<unknown> };
-};
-
-
-export function DExtraCrudController(
-    options?: ExtraCrudOptions,
-) {
-    @Controller()
-    @UseInterceptors(/* your interceptors if any */)
-    @ApiBearerAuth()
-    class ExtraCrudControllerHost {
-        constructor(
-            public readonly schemaCrudService: DExtraCrudService,
-        ) {
-        }
-
-        @Get('/list/:parentId')
-        async findAll(
-            @Param('parentId') parentId: string
-        ) {
-            return await this.schemaCrudService.findAll(parentId)
-        }
-
-        @Get('/:id')
-        async findOne(
-            @Param('id') id: string
-        ) {
-            return await this.schemaCrudService.findOne(id)
-        }
-
-        @Post()
-        @ApiBody({ type: options?.createDto })
-        async create(
-            @Body() itemData: any
-        ) {
-            return await this.schemaCrudService.create(itemData)
-        }
-
-        @Put('/:id')
-        @ApiBody({ type: options?.updateDto })
-        async update(
-            @Param('id') id: string,
-            @Body() itemData: any
-        ) {
-            return await this.schemaCrudService.update(id, itemData)
-        }
-
-        @Delete('/:id')
-        async delete(
-            @Param('id') id: string
-        ) {
-            return await this.schemaCrudService.delete(id)
-        }
-    }
-    return ExtraCrudControllerHost
-}
+import { Body, Controller, Delete, Get, Param, Post, Put, UseInterceptors } from "@nestjs/common";
+import { ApiBearerAuth, ApiBody } from "@nestjs/swagger";
+import { DExtraCrudService } from "../services/extra-crud.service";
+
+export type ExtraCrudOptions = {
+    createDto?: { new(): NonNullable<unknown> };
+    updateDto?: { new(): NonNullable<unknown> };
+};
+
+
+export function DExtraCrudController(
+    options?: ExtraCrudOptions,
+): any {
+    @Controller()
+    @UseInterceptors(/* your interceptors if any */)
+    @ApiBearerAuth()
+    class ExtraCrudControllerHost {
+        constructor(
+            public readonly schemaCrudService: DExtraCrudService,
+        ) {
+        }
+
+        @Get('/list/:parentId')
+        async findAll(
+            @Param('parentId') parentId: string
+        ) {
+            return await this.schemaCrudService.findAll(parentId)
+        }
+
+        @Get('/:id')
+        async findOne(
+            @Param('id') id: string
+        ) {
+            return await this.schemaCrudService.findOne(id)
+        }
+
+        @Post()
+        @ApiBody({ type: options?.createDto })
+        async create(
+            @Body() itemData: any
+        ) {
+            return await this.schemaCrudService.create(itemData)
+        }
+
+        @Put('/:id')
+        @ApiBody({ type: options?.updateDto })
+        async update(
+            @Param('id') id: string,
+            @Body() itemData: any
+        ) {
+            return await this.schemaCrudService.update(id, itemData)
+        }
+
+        @Delete('/:id')
+        async delete(
+            @Param('id') id: string
+        ) {
+            return await this.schemaCrudService.delete(id)
+        }
+    }
+    return ExtraCrudControllerHost
+}

package/src/generics/drizzle/controllers/index.ts

@@ -1,2 +1,2 @@
-export * from './extra-crud.controller'
+export * from './extra-crud.controller'
 export * from './extra-crud.controller'

package/src/generics/drizzle/controllers/relation-crud.controller.ts

@@ -1,39 +1,39 @@
-import { Body, Controller, Get, Param, Post } from "@nestjs/common";
-import { DRelationCrudService } from "../services/relation-crud.service";
-import { AssignSecondForFirstDTO, AssignFirstForSecondDTO } from "../../dtos/relation-crud.dto";
-
-@Controller()
-export class DRelationCrudController {
-    constructor(
-        private readonly schemaCrudService: DRelationCrudService,
-    ) {
-    }
-
-    @Get('/given-first/:id')
-    async givenFirst(
-        @Param('id') id: string
-    ) {
-        return await this.schemaCrudService.givenFirst(id)
-    }
-
-    @Get('/given-second/:id')
-    async givenSecond(
-        @Param('id') id: string
-    ) {
-        return await this.schemaCrudService.givenSecond(id)
-    }
-
-    @Post('assign-firsts-for-second')
-    async assignSecond(
-        @Body() itemData: AssignFirstForSecondDTO
-    ) {
-        return await this.schemaCrudService.assignFirstsForSecond(itemData.secondId, itemData.firstIds)
-    }
-
-    @Post('assign-seconds-for-first')
-    async assignFirst(
-        @Body() itemData: AssignSecondForFirstDTO
-    ) {
-        return await this.schemaCrudService.assignSecondsForFirst(itemData.firstId, itemData.secondIds)
-    }
-}
+import { Body, Controller, Get, Param, Post } from "@nestjs/common";
+import { DRelationCrudService } from "../services/relation-crud.service";
+import { AssignSecondForFirstDTO, AssignFirstForSecondDTO } from "../../dtos/relation-crud.dto";
+
+@Controller()
+export class DRelationCrudController {
+    constructor(
+        private readonly schemaCrudService: DRelationCrudService,
+    ) {
+    }
+
+    @Get('/given-first/:id')
+    async givenFirst(
+        @Param('id') id: string
+    ) {
+        return await this.schemaCrudService.givenFirst(id)
+    }
+
+    @Get('/given-second/:id')
+    async givenSecond(
+        @Param('id') id: string
+    ) {
+        return await this.schemaCrudService.givenSecond(id)
+    }
+
+    @Post('assign-firsts-for-second')
+    async assignSecond(
+        @Body() itemData: AssignFirstForSecondDTO
+    ) {
+        return await this.schemaCrudService.assignFirstsForSecond(itemData.secondId, itemData.firstIds)
+    }
+
+    @Post('assign-seconds-for-first')
+    async assignFirst(
+        @Body() itemData: AssignSecondForFirstDTO
+    ) {
+        return await this.schemaCrudService.assignSecondsForFirst(itemData.firstId, itemData.secondIds)
+    }
+}

package/src/generics/drizzle/controllers/schema-crud.controller.ts

@@ -1,60 +1,60 @@
-import { Body, Controller, Delete, Get, Param, Post, Put, UseInterceptors } from "@nestjs/common";
-import { DSchemaCrudService } from "../services/schema-crud.service";
-import { ApiBearerAuth, ApiBody } from "@nestjs/swagger";
-
-export type SchemaCrudOptions = {
-    createDto?: { new(): NonNullable<unknown> };
-    updateDto?: { new(): NonNullable<unknown> };
-};
-
-
-export function DSchemaCrudController(
-    options?: SchemaCrudOptions,
-) {
-    @Controller()
-    @UseInterceptors(/* your interceptors if any */)
-    @ApiBearerAuth()
-    class SchemaCrudControllerHost {
-        constructor(
-            public readonly schemaCrudService: DSchemaCrudService,
-        ) {
-        }
-
-        @Get()
-        async findAll() {
-            return await this.schemaCrudService.findAll()
-        }
-
-        @Get('/:id')
-        async findOne(
-            @Param('id') id: string
-        ) {
-            return await this.schemaCrudService.findOne(id)
-        }
-
-        @Post()
-        @ApiBody({ type: options?.createDto })
-        async create(
-            @Body() itemData: any
-        ) {
-            return await this.schemaCrudService.create(itemData)
-        }
-
-        @Put('/:id')
-        @ApiBody({ type: options?.updateDto })
-        async update(
-            @Param('id') id: string,
-            @Body() itemData: any
-        ) {
-            return await this.schemaCrudService.update(id, itemData)
-        }
-
-        @Delete('/:id')
-        async delete(
-            @Param('id') id: string
-        ) {
-            return await this.schemaCrudService.delete(id)
-        }
-    }
-    return SchemaCrudControllerHost
-}
+import { Body, Controller, Delete, Get, Param, Post, Put, UseInterceptors } from "@nestjs/common";
+import { DSchemaCrudService } from "../services/schema-crud.service";
+import { ApiBearerAuth, ApiBody } from "@nestjs/swagger";
+
+export type SchemaCrudOptions = {
+    createDto?: { new(): NonNullable<unknown> };
+    updateDto?: { new(): NonNullable<unknown> };
+};
+
+
+export function DSchemaCrudController(
+    options?: SchemaCrudOptions,
+): any {
+    @Controller()
+    @UseInterceptors(/* your interceptors if any */)
+    @ApiBearerAuth()
+    class SchemaCrudControllerHost {
+        constructor(
+            public readonly schemaCrudService: DSchemaCrudService,
+        ) {
+        }
+
+        @Get()
+        async findAll() {
+            return await this.schemaCrudService.findAll()
+        }
+
+        @Get('/:id')
+        async findOne(
+            @Param('id') id: string
+        ) {
+            return await this.schemaCrudService.findOne(id)
+        }
+
+        @Post()
+        @ApiBody({ type: options?.createDto })
+        async create(
+            @Body() itemData: any
+        ) {
+            return await this.schemaCrudService.create(itemData)
+        }
+
+        @Put('/:id')
+        @ApiBody({ type: options?.updateDto })
+        async update(
+            @Param('id') id: string,
+            @Body() itemData: any
+        ) {
+            return await this.schemaCrudService.update(id, itemData)
+        }
+
+        @Delete('/:id')
+        async delete(
+            @Param('id') id: string
+        ) {
+            return await this.schemaCrudService.delete(id)
+        }
+    }
+    return SchemaCrudControllerHost
+}

package/src/generics/drizzle/index.ts

@@ -1,2 +1,2 @@
-export * from './controllers'
+export * from './controllers'
 export * from './services'

package/src/generics/drizzle/services/extra-crud.service.ts

@@ -1,44 +1,44 @@
-import { Injectable } from "@nestjs/common";
-import { eq } from "drizzle-orm";
-import { NodePgDatabase } from "drizzle-orm/node-postgres";
-import { PgTableWithColumns } from "drizzle-orm/pg-core";
-
-@Injectable()
-export class DExtraCrudService {
-    constructor(
-        protected readonly db: NodePgDatabase<any>,
-        private readonly schema: PgTableWithColumns<any>,
-        private readonly parentFieldName: string
-    ) {
-    }
-
-    async findAll(parentFieldValue: string) {
-        const data = await this.db.select()
-            .from(this.schema)
-            .where(eq(this.schema[this.parentFieldName], parentFieldValue))
-
-        return {
-            count: data.length,
-            items: data
-        }
-
-    }
-
-    async findOne(id: string) {
-        return await this.db.select()
-            .from(this.schema)
-            .where(eq(this.schema.id, id));
-    }
-
-    async create(itemData: any) {
-        return await this.db.insert(this.schema).values(itemData).returning();
-    }
-
-    async update(id: string, itemData: any) {
-        return await this.db.update(this.schema).set(itemData).where(eq(this.schema.id, id));
-    }
-
-    async delete(id: string) {
-        return await this.db.delete(this.schema).where(eq(this.schema.id, id));
-    }
+import { Injectable } from "@nestjs/common";
+import { eq } from "drizzle-orm";
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
+import { PgTableWithColumns } from "drizzle-orm/pg-core";
+
+@Injectable()
+export class DExtraCrudService {
+    constructor(
+        protected readonly db: NodePgDatabase<any>,
+        private readonly schema: PgTableWithColumns<any>,
+        private readonly parentFieldName: string
+    ) {
+    }
+
+    async findAll(parentFieldValue: string) {
+        const data = await this.db.select()
+            .from(this.schema)
+            .where(eq(this.schema[this.parentFieldName], parentFieldValue))
+
+        return {
+            count: data.length,
+            items: data
+        }
+
+    }
+
+    async findOne(id: string) {
+        return await this.db.select()
+            .from(this.schema)
+            .where(eq(this.schema.id, id));
+    }
+
+    async create(itemData: any) {
+        return await this.db.insert(this.schema).values(itemData).returning();
+    }
+
+    async update(id: string, itemData: any) {
+        return await this.db.update(this.schema).set(itemData).where(eq(this.schema.id, id));
+    }
+
+    async delete(id: string) {
+        return await this.db.delete(this.schema).where(eq(this.schema.id, id));
+    }
 }

package/src/generics/drizzle/services/index.ts

@@ -1,2 +1,2 @@
-export * from './schema-crud.service'
+export * from './schema-crud.service'
 export * from './extra-crud.service'