Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
343 changes: 308 additions & 35 deletions backend/package-lock.json

Large diffs are not rendered by default.

17 changes: 13 additions & 4 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,40 @@
},
"dependencies": {
"@nestjs/common": "^10.0.0",
"@nestjs/config": "^3.0.0",
"@nestjs/config": "^3.3.0",
"@nestjs/core": "^10.0.0",
"@nestjs/event-emitter": "^3.0.1",
"@nestjs/jwt": "^11.0.0",
"@nestjs/jwt": "^11.0.2",
"@nestjs/mapped-types": "*",
"@nestjs/passport": "^11.0.5",
"@nestjs/platform-express": "^10.0.0",
"@nestjs/schedule": "^6.0.1",
"@nestjs/swagger": "^7.3.0",
"@nestjs/throttler": "^6.5.0",
"@nestjs/typeorm": "^10.0.2",
"@types/multer": "^2.0.0",
"@types/speakeasy": "^2.0.10",
"@types/uuid": "^10.0.0",
"bcryptjs": "^3.0.2",
"bcryptjs": "^3.0.3",
"bwip-js": "^4.7.0",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.0",
"class-validator": "^0.14.3",
"date-fns": "^4.1.0",
"json2csv": "^6.0.0-alpha.2",
"multer": "^2.0.2",
"nestjs-i18n": "^10.5.1",
"otplib": "^13.1.1",
"papaparse": "^5.5.3",
"passport": "^0.7.0",
"passport-jwt": "^4.0.1",
"passport-local": "^1.0.0",
"pdfkit": "^0.17.2",
"pg": "^8.11.3",
"qrcode": "^1.5.4",
"redis": "^5.10.0",
"reflect-metadata": "^0.2.0",
"rxjs": "^7.8.1",
"speakeasy": "^2.0.0",
"swagger-ui-express": "^5.0.1",
"typeorm": "^0.3.27"
},
Expand All @@ -60,9 +66,12 @@
"@types/express": "^5.0.0",
"@types/jest": "^29.5.2",
"@types/json2csv": "^5.0.7",
"@types/jsonwebtoken": "^9.0.10",
"@types/node": "^20.3.1",
"@types/otplib": "^7.0.0",
"@types/papaparse": "^5.3.16",
"@types/passport-jwt": "^4.0.1",
"@types/passport-local": "^1.0.38",
"@types/pdfkit": "^0.17.3",
"@types/pg": "^8.10.0",
"@types/supertest": "^6.0.0",
Expand Down
103 changes: 103 additions & 0 deletions backend/src/app.module.original.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
import { Module } from '@nestjs/common';
import { ConfigModule, ConfigService } from '@nestjs/config';
import { TypeOrmModule } from '@nestjs/typeorm';
import { ScheduleModule } from '@nestjs/schedule';
import { AppController } from './app.controller';
import { AppService } from './app.service';
import { UsersModule } from './users/users.module';
import { AuthModule } from './auth/auth.module';
// import { ApiKeysModule } from "./api-keys/api-keys.module";
// import { OrganizationUnitsModule } from "./organization-units/organization-units.module";
// import { ChangeLogModule } from "./change-log/change-log.module";
// import { BarcodeModule } from "./barcode/barcode.module";
// import { ComplianceModule } from "./compliance/compliance.module";
// import { MobileDevicesModule } from "./mobile-devices/mobile-devices.module";
// import { PolicyDocumentsModule } from "./policy-documents/policy-documents.module";
// import { DeviceHealthModule } from "./device-health/device-health.module";
// import { QRCodeModule } from "./QR-Code/qrcode.module";
// import { NotificationsModule } from "./notifications/notifications.module";
// import { StatusHistoryModule } from "./status-history/status-history.module";
// import { DisposalRegistryModule } from "./disposal-registry/disposal-registry.module";
// import { VendorDirectoryModule } from "./vendor-directory/vendor-directory.module";
import { WebhooksModule } from './webhooks/webhooks.module';
import { AuditLogsModule } from './audit-logs/audit-logs.module';
import { AuditLoggingInterceptor } from './audit-logs/audit-logging.interceptor';
import { APP_INTERCEPTOR } from '@nestjs/core';
import { AssetCategory } from './asset-categories/asset-category.entity';
import { Department } from './departments/department.entity';
import { User } from './users/entities/user.entity';
import { FileUpload } from './file-uploads/entities/file-upload.entity';
import { Asset } from './assets/entities/asset.entity';
import { Supplier } from './suppliers/entities/supplier.entity';
import { AssetCategoriesModule } from './asset-categories/asset-categories.module';
import { DepartmentsModule } from './departments/departments.module';
import { AssetTransfersModule } from './asset-transfers/asset-transfers.module';
import { SearchModule } from './search/search.module';
import { ApiKeyModule } from './api-key/api-key.module';
import { NestModule } from './scheduled-jobs/nest/nest.module';
import { ScheduledJobsModule } from './scheduled-jobs/scheduled-jobs.module';
import { AssetsModule } from './assets/assets.module';

@Module({
imports: [
ConfigModule.forRoot({
isGlobal: true,
}),
TypeOrmModule.forRootAsync({
imports: [ConfigModule],
useFactory: (configService: ConfigService) => ({
type: 'postgres',
host: configService.get('DB_HOST', 'localhost'),
port: configService.get('DB_PORT', 5432),
username: configService.get('DB_USERNAME', 'postgres'),
password: configService.get('DB_PASSWORD', 'password'),
database: configService.get('DB_DATABASE', 'manage_assets'),
entities: [
AssetCategory,
Department,
User,
FileUpload,
Asset,
Supplier,
],
synchronize: configService.get('NODE_ENV') !== 'production', // Only for development
}),
inject: [ConfigService],
}),

AssetCategoriesModule,
DepartmentsModule,
AssetTransfersModule,
UsersModule,
SearchModule,
AuthModule,
// ApiKeysModule,
// OrganizationUnitsModule,
// ChangeLogModule,
// BarcodeModule,
// ComplianceModule,
// MobileDevicesModule,
// PolicyDocumentsModule,
// DeviceHealthModule,
// QRCodeModule,
// NotificationsModule,
// StatusHistoryModule,
// DisposalRegistryModule,
// VendorDirectoryModule,
WebhooksModule,
AuditLogsModule,
ApiKeyModule,
NestModule,
ScheduledJobsModule,
AssetsModule
],
controllers: [AppController],
providers: [
{
provide: APP_INTERCEPTOR,
useClass: AuditLoggingInterceptor,
},
AppService,
],
})
export class AppModule {}
2 changes: 1 addition & 1 deletion backend/src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { AssetCategory } from './asset-categories/asset-category.entity';
import { Department } from './departments/department.entity';
import { User } from './users/entities/user.entity';
import { FileUpload } from './file-uploads/entities/file-upload.entity';
import { Asset } from './assets/entities/assest.entity';
import { Asset } from './assets/entities/asset.entity';
import { Supplier } from './suppliers/entities/supplier.entity';
import { AssetCategoriesModule } from './asset-categories/asset-categories.module';
import { DepartmentsModule } from './departments/departments.module';
Expand Down
11 changes: 11 additions & 0 deletions backend/src/asset-categories/asset-categories.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { AssetCategory } from './asset-category.entity';

@Module({
imports: [
TypeOrmModule.forFeature([AssetCategory]),
],
exports: [TypeOrmModule],
})
export class AssetCategoriesModule {}
40 changes: 40 additions & 0 deletions backend/src/asset-categories/asset-category.entity.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import {
Entity,
Column,
PrimaryGeneratedColumn,
CreateDateColumn,
UpdateDateColumn,
DeleteDateColumn,
OneToMany,
} from 'typeorm';
import { Asset } from '../assets/entities/asset.entity';

@Entity('asset_categories')
export class AssetCategory {
@PrimaryGeneratedColumn('uuid')
id: string;

@Column({ unique: true })
name: string;

@Column({ nullable: true })
description?: string;

@Column({ default: true })
isActive: boolean;

@Column({ name: 'depreciation_rate', type: 'decimal', precision: 5, scale: 2, nullable: true })
depreciationRate?: number;

@OneToMany(() => Asset, (asset) => asset.category)
assets: Asset[];

@CreateDateColumn({ name: 'created_at' })
createdAt: Date;

@UpdateDateColumn({ name: 'updated_at' })
updatedAt: Date;

@DeleteDateColumn({ name: 'deleted_at' })
deletedAt: Date;
}
15 changes: 15 additions & 0 deletions backend/src/audit-logs/audit-logging.interceptor.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import {
Injectable,
ExecutionContext,
CallHandler,
} from '@nestjs/common';
import { Observable } from 'rxjs';

@Injectable()
export class AuditLoggingInterceptor {
intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
// Add audit logging logic here
// For now, just pass through the request
return next.handle();
}
}
9 changes: 9 additions & 0 deletions backend/src/audit-logs/audit-logs.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { Module } from '@nestjs/common';

@Module({
imports: [],
controllers: [],
providers: [],
exports: [],
})
export class AuditLogsModule {}
Loading
Loading