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
69 changes: 42 additions & 27 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@
"@nestjs/platform-express": "^10.0.0",
"@nestjs/swagger": "^7.3.0",
"@nestjs/typeorm": "^10.0.2",
"@types/multer": "^2.0.0",
"@types/uuid": "^10.0.0",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.0",
"json2csv": "^6.0.0-alpha.2",
"multer": "^2.0.2",
"nestjs-i18n": "^10.5.1",
"pdfkit": "^0.17.2",
"pg": "^8.11.3",
Expand Down
10 changes: 9 additions & 1 deletion backend/src/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Module } from '@nestjs/common';
import { ConfigModule, ConfigService } from '@nestjs/config';
import { TypeOrmModule } from '@nestjs/typeorm';
import { AppController } from './app.controller';
import { AppService } from './app.service';
import { AssetCategoriesModule } from './asset-categories/asset-categories.module';
Expand All @@ -25,7 +26,14 @@ import { SearchModule } from './search/search.module';
username: configService.get('DB_USERNAME', 'postgres'),
password: configService.get('DB_PASSWORD', 'password'),
database: configService.get('DB_DATABASE', 'manage_assets'),
entities: [AssetCategory, Department, User],
entities: [
AssetCategory,
Department,
User,
FileUpload,
Asset,
Supplier,
],
synchronize: configService.get('NODE_ENV') !== 'production', // Only for development
}),
inject: [ConfigService],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,59 @@ import {
Entity,
PrimaryGeneratedColumn,
Column,
ManyToOne,
OneToMany,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from 'typeorm';
import { Supplier } from '../../suppliers/entities/supplier.entity';
import { Department } from '../../departments/entities/department.entity';
import { Category } from '../../categories/entities/category.entity';
import { Department } from '../../departments/department.entity';
// import { Category } from '../../categories/entities/category.entity';
import { FileUpload } from '../../file-uploads/entities/file-upload.entity';

@Entity('assets')
export class Asset {
@PrimaryGeneratedColumn()
id: number;
@PrimaryGeneratedColumn('uuid')
id: string;

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

@Column()
name: string;

@Column({ type: 'decimal', precision: 12, scale: 2, nullable: true })
purchaseCost?: number;

@Column({ type: 'date' })
purchaseDate: Date;

@Column({ type: 'date', nullable: true })
warrantyEnd?: Date;

@ManyToOne(() => Supplier, { nullable: false })
@Column({ type: 'text', nullable: true })
description?: string;

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

// Relationships
@ManyToOne(() => Supplier, (supplier) => supplier.files, { nullable: true })
@JoinColumn({ name: 'supplier_id' })
supplier: Supplier;
supplier?: Supplier;

@ManyToOne(() => Department, { nullable: true })
@JoinColumn({ name: 'assigned_department_id' })
assignedDepartment?: Department;

@ManyToOne(() => Category, { nullable: false })
@JoinColumn({ name: 'category_id' })
category: Category;

@Column({ type: 'decimal', precision: 12, scale: 2, nullable: true })
purchaseCost?: number;

@Column({ type: 'text', nullable: true })
description?: string;
// This should be uncommented when the category entity is created
// @ManyToOne(() => Category, { nullable: false })
// @JoinColumn({ name: 'category_id' })
// category: Category;

@Column({ default: true })
isActive: boolean;
@OneToMany(() => FileUpload, (fileUpload) => fileUpload.asset)
files: FileUpload[];

@CreateDateColumn()
createdAt: Date;
Expand Down
19 changes: 19 additions & 0 deletions backend/src/file-uploads/dto/create-file-upload.dto.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { IsEnum, IsOptional, IsString, IsUUID } from 'class-validator';
import { FileCategory } from '../entities/file-upload.entity';

export class CreateFileUploadDto {
@IsEnum(FileCategory)
category: FileCategory;

@IsString()
@IsOptional()
description?: string;

@IsUUID()
@IsOptional()
assetId?: string;

@IsUUID()
@IsOptional()
supplierId?: string;
}
Loading