proflores-db-model 0.0.9 → 0.1.10

package/dist/entities/ExpenseDetail.js

@@ -24,29 +24,21 @@ __decorate([
     __metadata("design:type", ExpenseTransaction_1.ExpenseTransaction)
 ], ExpenseDetail.prototype, "expenseTransaction", void 0);
 __decorate([
-    (0, typeorm_1.Column)("varchar"),
+    (0, typeorm_1.Column)("varchar", { nullable: false }),
     __metadata("design:type", String)
 ], ExpenseDetail.prototype, "concept", void 0);
 __decorate([
-    (0, typeorm_1.Column)("decimal"),
+    (0, typeorm_1.Column)("decimal", { nullable: false }),
     __metadata("design:type", Number)
 ], ExpenseDetail.prototype, "quantity", void 0);
 __decorate([
-    (0, typeorm_1.Column)("decimal"),
+    (0, typeorm_1.Column)("decimal", { nullable: false }),
     __metadata("design:type", Number)
 ], ExpenseDetail.prototype, "unitPrice", void 0);
 __decorate([
-    (0, typeorm_1.Column)("decimal"),
-    __metadata("design:type", Number)
-], ExpenseDetail.prototype, "subtotal", void 0);
-__decorate([
-    (0, typeorm_1.Column)("date"),
+    (0, typeorm_1.Column)("date", { nullable: false }),
     __metadata("design:type", Date)
 ], ExpenseDetail.prototype, "purchaseDate", void 0);
-__decorate([
-    (0, typeorm_1.Column)("varchar"),
-    __metadata("design:type", String)
-], ExpenseDetail.prototype, "expenseCategory", void 0);
 ExpenseDetail = __decorate([
     (0, typeorm_1.Entity)()
 ], ExpenseDetail);

package/dist/entities/ExpenseTransaction.js

@@ -22,23 +22,23 @@ __decorate([
     __metadata("design:type", Number)
 ], ExpenseTransaction.prototype, "expenseTransactionId", void 0);
 __decorate([
-    (0, typeorm_1.Column)("varchar"),
+    (0, typeorm_1.Column)("varchar", { nullable: false }),
     __metadata("design:type", String)
 ], ExpenseTransaction.prototype, "bankId", void 0);
 __decorate([
-    (0, typeorm_1.Column)("decimal"),
+    (0, typeorm_1.Column)("decimal", { nullable: false }),
     __metadata("design:type", Number)
 ], ExpenseTransaction.prototype, "amount", void 0);
 __decorate([
-    (0, typeorm_1.Column)("date"),
+    (0, typeorm_1.Column)("date", { nullable: false }),
     __metadata("design:type", Date)
 ], ExpenseTransaction.prototype, "transactionDate", void 0);
 __decorate([
-    (0, typeorm_1.Column)("varchar"),
+    (0, typeorm_1.Column)("varchar", { nullable: false }),
     __metadata("design:type", String)
 ], ExpenseTransaction.prototype, "paymentMethod", void 0);
 __decorate([
-    (0, typeorm_1.Column)("text"),
+    (0, typeorm_1.Column)("text", { nullable: false }),
     __metadata("design:type", String)
 ], ExpenseTransaction.prototype, "description", void 0);
 __decorate([
@@ -46,17 +46,19 @@ __decorate([
     __metadata("design:type", String)
 ], ExpenseTransaction.prototype, "mediaFile", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(() => ProjectOrder_1.ProjectOrder),
+    (0, typeorm_1.ManyToOne)(() => ProjectOrder_1.ProjectOrder, { nullable: false }),
     (0, typeorm_1.JoinColumn)({ name: "projectId" }),
     __metadata("design:type", ProjectOrder_1.ProjectOrder)
 ], ExpenseTransaction.prototype, "projectOrder", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(() => ExpenseType_1.ExpenseType),
+    (0, typeorm_1.ManyToOne)(() => ExpenseType_1.ExpenseType, { nullable: false }),
     (0, typeorm_1.JoinColumn)({ name: "expenseTypeId" }),
     __metadata("design:type", ExpenseType_1.ExpenseType)
 ], ExpenseTransaction.prototype, "expenseType", void 0);
 __decorate([
-    (0, typeorm_1.OneToMany)(() => ExpenseDetail_1.ExpenseDetail, detail => detail.expenseTransaction, { cascade: true }),
+    (0, typeorm_1.OneToMany)(() => ExpenseDetail_1.ExpenseDetail, (detail) => detail.expenseTransaction, {
+        cascade: true,
+    }),
     __metadata("design:type", Array)
 ], ExpenseTransaction.prototype, "expenseDetails", void 0);
 ExpenseTransaction = __decorate([

package/dist/entities/ProjectOrder.js

@@ -19,7 +19,7 @@ __decorate([
     __metadata("design:type", Number)
 ], ProjectOrder.prototype, "projectId", void 0);
 __decorate([
-    (0, typeorm_1.Column)("varchar"),
+    (0, typeorm_1.Column)("varchar", { nullable: false }),
     __metadata("design:type", String)
 ], ProjectOrder.prototype, "name", void 0);
 __decorate([

package/dist/entities/Transaction.js

@@ -1,60 +1 @@
 "use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Transaction = void 0;
-// src/entities/Transaction.ts
-const typeorm_1 = require("typeorm");
-const ProjectOrder_1 = require("./ProjectOrder");
-const ExpenseType_1 = require("./ExpenseType");
-let Transaction = class Transaction {
-};
-__decorate([
-    (0, typeorm_1.PrimaryGeneratedColumn)("increment"),
-    __metadata("design:type", Number)
-], Transaction.prototype, "transactionId", void 0);
-__decorate([
-    (0, typeorm_1.Column)("varchar"),
-    __metadata("design:type", String)
-], Transaction.prototype, "bankId", void 0);
-__decorate([
-    (0, typeorm_1.Column)("decimal"),
-    __metadata("design:type", Number)
-], Transaction.prototype, "amount", void 0);
-__decorate([
-    (0, typeorm_1.Column)("date"),
-    __metadata("design:type", Date)
-], Transaction.prototype, "transactionDate", void 0);
-__decorate([
-    (0, typeorm_1.Column)("varchar"),
-    __metadata("design:type", String)
-], Transaction.prototype, "paymentMethod", void 0);
-__decorate([
-    (0, typeorm_1.Column)("text"),
-    __metadata("design:type", String)
-], Transaction.prototype, "description", void 0);
-__decorate([
-    (0, typeorm_1.Column)("varchar", { nullable: true }),
-    __metadata("design:type", String)
-], Transaction.prototype, "mediaFile", void 0);
-__decorate([
-    (0, typeorm_1.ManyToOne)(() => ProjectOrder_1.ProjectOrder),
-    (0, typeorm_1.JoinColumn)({ name: "projectId" }),
-    __metadata("design:type", ProjectOrder_1.ProjectOrder)
-], Transaction.prototype, "projectOrder", void 0);
-__decorate([
-    (0, typeorm_1.ManyToOne)(() => ExpenseType_1.ExpenseType),
-    (0, typeorm_1.JoinColumn)({ name: "expenseTypeId" }),
-    __metadata("design:type", ExpenseType_1.ExpenseType)
-], Transaction.prototype, "expenseType", void 0);
-Transaction = __decorate([
-    (0, typeorm_1.Entity)()
-], Transaction);
-exports.Transaction = Transaction;

package/dist/entities/User.js

@@ -31,15 +31,15 @@ __decorate([
     __metadata("design:type", Object)
 ], User.prototype, "lastName", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
+    (0, typeorm_1.Column)({ type: 'varchar', unique: true, nullable: true }),
     __metadata("design:type", Object)
 ], User.prototype, "googleId", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
+    (0, typeorm_1.Column)({ type: 'varchar', unique: true, nullable: true }),
     __metadata("design:type", Object)
 ], User.prototype, "facebookId", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
+    (0, typeorm_1.Column)({ type: 'varchar', unique: true, nullable: true }),
     __metadata("design:type", Object)
 ], User.prototype, "appleId", void 0);
 __decorate([

package/dist/index.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExpenseTransaction = exports.User = exports.ProjectOrder = exports.ExpenseType = exports.ExpenseDetail = exports.Transaction = void 0;
-var Transaction_1 = require("./entities/Transaction");
-Object.defineProperty(exports, "Transaction", { enumerable: true, get: function () { return Transaction_1.Transaction; } });
+exports.ExpenseTransaction = exports.User = exports.ProjectOrder = exports.ExpenseType = exports.ExpenseDetail = void 0;
 var ExpenseDetail_1 = require("./entities/ExpenseDetail");
 Object.defineProperty(exports, "ExpenseDetail", { enumerable: true, get: function () { return ExpenseDetail_1.ExpenseDetail; } });
 var ExpenseType_1 = require("./entities/ExpenseType");

package/dist/types/ExpenseDetailType.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/ExpenseTransactionType.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/ExpenseTypeType.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/ProjectOrderType.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "proflores-db-model",
-  "version": "0.0.9",
+  "version": "0.1.10",
   "description": "Data model for managing expenses and transactions for Proflores nursery business",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/entities/ExpenseDetail.ts

@@ -10,21 +10,15 @@ export class ExpenseDetail implements ObjectLiteral  {
   @JoinColumn({ name: "expenseTransactionId" })
   expenseTransaction!: ExpenseTransaction;
 
-  @Column("varchar")
+  @Column("varchar", { nullable: false })
   concept!: string;
 
-  @Column("decimal")
+  @Column("decimal", { nullable: false })
   quantity!: number;
 
-  @Column("decimal")
+  @Column("decimal", { nullable: false })
   unitPrice!: number;
 
-  @Column("decimal")
-  subtotal!: number;
-
-  @Column("date")
+  @Column("date", { nullable: false })
   purchaseDate!: Date;
-
-  @Column("varchar")
-  expenseCategory!: string;
 }

package/src/entities/ExpenseTransaction.ts

@@ -1,5 +1,13 @@
 // src/entities/ExpenseTransaction.ts
-import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, OneToMany, ObjectLiteral } from "typeorm";
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  ManyToOne,
+  JoinColumn,
+  OneToMany,
+  ObjectLiteral,
+} from "typeorm";
 import { ProjectOrder } from "./ProjectOrder";
 import { ExpenseType } from "./ExpenseType";
 import { ExpenseDetail } from "./ExpenseDetail";
@@ -9,32 +17,34 @@ export class ExpenseTransaction implements ObjectLiteral {
   @PrimaryGeneratedColumn("increment")
   expenseTransactionId!: number;
 
-  @Column("varchar")
+  @Column("varchar", { nullable: false })
   bankId!: string;
 
-  @Column("decimal")
+  @Column("decimal", { nullable: false })
   amount!: number;
 
-  @Column("date")
+  @Column("date", { nullable: false })
   transactionDate!: Date;
 
-  @Column("varchar")
+  @Column("varchar", { nullable: false })
   paymentMethod!: string;
 
-  @Column("text")
+  @Column("text", { nullable: false })
   description!: string;
 
-  @Column("varchar", { nullable: true }) 
+  @Column("varchar", { nullable: true })
   mediaFile!: string;
 
-  @ManyToOne(() => ProjectOrder)
+  @ManyToOne(() => ProjectOrder, { nullable: false })
   @JoinColumn({ name: "projectId" })
   projectOrder!: ProjectOrder;
 
-  @ManyToOne(() => ExpenseType)
+  @ManyToOne(() => ExpenseType, { nullable: false })
   @JoinColumn({ name: "expenseTypeId" })
   expenseType!: ExpenseType;
 
-  @OneToMany(() => ExpenseDetail, detail => detail.expenseTransaction, { cascade: true })
+  @OneToMany(() => ExpenseDetail, (detail) => detail.expenseTransaction, {
+    cascade: true,
+  })
   expenseDetails!: ExpenseDetail[];
 }

package/src/entities/ProjectOrder.ts

@@ -6,7 +6,7 @@ export class ProjectOrder implements ObjectLiteral {
   @PrimaryGeneratedColumn("increment")
   projectId!: number;
 
-  @Column("varchar")
+  @Column("varchar", { nullable: false })
   name!: string;
 
   @Column("text")

package/src/entities/Transaction.ts

@@ -1,36 +0,0 @@
-// src/entities/Transaction.ts
-import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn } from "typeorm";
-import { ProjectOrder } from "./ProjectOrder";
-import { ExpenseType } from "./ExpenseType";
-
-@Entity()
-export class Transaction {
-  @PrimaryGeneratedColumn("increment")
-  transactionId!: number;
-
-  @Column("varchar")
-  bankId!: string;
-
-  @Column("decimal")
-  amount!: number;
-
-  @Column("date")
-  transactionDate!: Date;
-
-  @Column("varchar")
-  paymentMethod!: string;
-
-  @Column("text")
-  description!: string;
-
-  @Column("varchar", { nullable: true }) 
-  mediaFile!: string;
-
-  @ManyToOne(() => ProjectOrder)
-  @JoinColumn({ name: "projectId" })
-  projectOrder!: ProjectOrder;
-
-  @ManyToOne(() => ExpenseType)
-  @JoinColumn({ name: "expenseTypeId" })
-  expenseType!: ExpenseType;
-}

package/src/entities/User.ts

@@ -15,13 +15,13 @@ export class User implements ObjectLiteral {
   @Column({ type: 'varchar', nullable: true })
   lastName!: string | null;
 
-  @Column({ type: 'varchar', nullable: true })
+  @Column({ type: 'varchar', unique: true, nullable: true })
   googleId!: string | null;
 
-  @Column({ type: 'varchar', nullable: true })
+  @Column({ type: 'varchar', unique: true, nullable: true })
   facebookId!: string | null; 
 
-  @Column({ type: 'varchar', nullable: true })
+  @Column({ type: 'varchar', unique: true, nullable: true })
   appleId!: string | null; 
 
   @Column({ type: 'varchar', nullable: true })

package/src/index.ts

@@ -1,4 +1,3 @@
-export { Transaction } from "./entities/Transaction";
 export { ExpenseDetail } from "./entities/ExpenseDetail";
 export { ExpenseType } from "./entities/ExpenseType";
 export { ProjectOrder } from "./entities/ProjectOrder";

package/src/types/ExpenseDetailType.ts

@@ -0,0 +1,11 @@
+// types/ExpenseDetailType.ts
+import { ExpenseTransactionType } from "./ExpenseTransactionType";
+
+export interface ExpenseDetailType {
+  expenseDetailId: number;
+  expenseTransaction?: ExpenseTransactionType;
+  concept: string;
+  quantity: number;
+  unitPrice: number;
+  purchaseDate: Date;
+}

package/src/types/ExpenseTransactionType.ts

@@ -0,0 +1,17 @@
+import { ProjectOrderType } from "./ProjectOrderType";
+import { ExpenseTypeType } from "./ExpenseTypeType";
+import { ExpenseDetailType } from "./ExpenseDetailType";
+
+export interface ExpenseTransactionType {
+    expenseTransactionId: number;
+    bankId: string;
+    amount: number;
+    transactionDate: Date;
+    paymentMethod: string;
+    description: string;
+    mediaFile?: string;
+    projectOrder?: ProjectOrderType; 
+    expenseType?: ExpenseTypeType;   
+    expenseDetails?: ExpenseDetailType[];  
+  }
+  

package/src/types/ExpenseTypeType.ts

@@ -0,0 +1,6 @@
+export interface ExpenseTypeType {
+    expenseTypeId: number;
+    name: string;
+    description: string;
+  }
+  

package/src/types/ProjectOrderType.ts

@@ -0,0 +1,11 @@
+export interface ProjectOrderType {
+    projectId: number;
+    name: string;
+    description: string;
+    location: string;
+    startDate: Date;
+    endDate: Date;
+    isActive: boolean;
+    estimatedAmount: number;
+  }
+