@tomei/sso 0.8.2 → 0.8.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/sso",
-  "version": "0.8.2",
+  "version": "0.8.5",
   "description": "Tomei SSO Package",
   "main": "dist/index.js",
   "scripts": {

package/src/components/login-history/login-history.repository.ts

@@ -1,38 +1,4 @@
 import LoginHistory from '../../models/login-history.entity';
-import prisma from '../../prisma-client/client';
-
-// export class LoginHistoryRepository {
-//   private _prisma: any;
-
-//   constructor(client?: any) {
-//     if (client) {
-//       this._prisma = client;
-//     } else {
-//       this._prisma = prisma;
-//     }
-//   }
-
-//   public async create(data: any): Promise<any> {
-//     return await this._prisma.loginHistory.create(data);
-//   }
-
-//   public async findAll(options: any): Promise<any[]> {
-//     return await this._prisma.loginHistory.findMany(options);
-//   }
-
-//   public async findOne(options: any): Promise<any> {
-//     return await this._prisma.loginHistory.findFirst(options);
-//   }
-
-//   public async update(where: any, data: any): Promise<any> {
-//     return await this._prisma.loginHistory.update(where, data);
-//   }
-
-//   public async delete(where: any): Promise<any> {
-//     return await this._prisma.loginHistory.delete(where);
-//   }
-// }
-
 import { RepositoryBase, IRepositoryBase } from '@tomei/general';
 
 export class LoginHistoryRepository

package/src/components/login-user/login-user.ts

@@ -13,13 +13,13 @@ import { UserGroupRepository } from '../user-group/user-group.repository';
 import * as nodemailer from 'nodemailer';
 import { Mailer } from '@tomei/mailer';
 import { ISystemLogin } from '../../../src/interfaces/system-login.interface';
-import Staff from 'models/staff.entity';
-import SystemPrivilege from 'models/system-privilege.entity';
-import LoginHistory from 'models/login-history.entity';
-import GroupSystemPrivilege from 'models/group-system-privilege.entity';
-import GroupRolePrivilege from 'models/group-role-privilege.entity';
-import UserGroup from 'models/user-group.entity';
-import UserSystemPrivileges from 'models/user-system-privileges.entity';
+import Staff from '../../models/staff.entity';
+import SystemPrivilege from '../../models/system-privilege.entity';
+import LoginHistory from '../../models/login-history.entity';
+import GroupSystemPrivilege from '../../models/group-system-privilege.entity';
+import GroupRolePrivilege from '../../models/group-role-privilege.entity';
+import UserGroup from '../../models/user-group.entity';
+import UserSystemPrivileges from '../../models/user-system-privileges.entity';
 export class LoginUser extends ObjectBase implements IPerson {
   FullName: string;
   IDNo: string;

package/src/components/login-user/user.repository.ts

@@ -1,38 +1,4 @@
 import User from '../../models/user.entity';
-import prisma from '../../prisma-client/client';
-
-// export class UserRepository {
-//   private _prisma: any;
-
-//   constructor(client?: any) {
-//     if (client) {
-//       this._prisma = client;
-//     } else {
-//       this._prisma = prisma;
-//     }
-//   }
-
-//   public async create(data: any): Promise<any> {
-//     return await this._prisma.user.create(data);
-//   }
-
-//   public async findAll(options: any): Promise<any[]> {
-//     return await this._prisma.user.findMany(options);
-//   }
-
-//   public async findOne(options: any): Promise<any> {
-//     return await this._prisma.user.findFirst(options);
-//   }
-
-//   public async update(where: any, data: any): Promise<any> {
-//     return await this._prisma.user.update(where, data);
-//   }
-
-//   public async delete(where: any): Promise<any> {
-//     return await this._prisma.user.delete(where);
-//   }
-// }
-
 import { RepositoryBase, IRepositoryBase } from '@tomei/general';
 
 export class UserRepository

package/src/components/system/system.repository.ts

@@ -1,39 +1,6 @@
-import System from 'models/system.entity';
-import prisma from '../../prisma-client/client';
+import System from '../../models/system.entity';
 import { RepositoryBase, IRepositoryBase } from '@tomei/general';
 
-// export class SystemRepository {
-//   private _prisma: any;
-
-//   constructor(client?: any) {
-//     if (client) {
-//       this._prisma = client;
-//     } else {
-//       this._prisma = prisma;
-//     }
-//   }
-
-//   public async create(data: any): Promise<any> {
-//     return await this._prisma.system.create(data);
-//   }
-
-//   public async findAll(options: any): Promise<any[]> {
-//     return await this._prisma.system.findMany(options);
-//   }
-
-//   public async findOne(options: any): Promise<any> {
-//     return await this._prisma.system.findFirst(options);
-//   }
-
-//   public async update(where: any, data: any): Promise<any> {
-//     return await this._prisma.system.update(where, data);
-//   }
-
-//   public async delete(where: any): Promise<any> {
-//     return await this._prisma.system.delete(where);
-//   }
-// }
-
 export class SystemRepository
   extends RepositoryBase<System>
   implements IRepositoryBase<System>

package/src/components/system-access/system-access.repository.ts

@@ -1,38 +1,4 @@
 import SystemAccess from '../../models/system-accesss.entity';
-import prisma from '../../prisma-client/client';
-
-// export class SystemAccessRepository {
-//   private _prisma: any;
-
-//   constructor(client?: any) {
-//     if (client) {
-//       this._prisma = client;
-//     } else {
-//       this._prisma = prisma;
-//     }
-//   }
-
-//   public async create(data: any): Promise<any> {
-//     return await this._prisma.systemAccess.create(data);
-//   }
-
-//   public async findAll(options: any): Promise<any[]> {
-//     return await this._prisma.systemAccess.findMany(options);
-//   }
-
-//   public async findOne(options: any): Promise<any> {
-//     return await this._prisma.systemAccess.findFirst(options);
-//   }
-
-//   public async update(where: any, data: any): Promise<any> {
-//     return await this._prisma.systemAccess.update(where, data);
-//   }
-
-//   public async delete(where: any): Promise<any> {
-//     return await this._prisma.systemAccess.delete(where);
-//   }
-// }
-
 import { RepositoryBase, IRepositoryBase } from '@tomei/general';
 
 export class SystemAccessRepository

package/src/components/user-group/user-group.repository.ts

@@ -1,38 +1,4 @@
 import UserGroup from '../../models/user-group.entity';
-import prisma from '../../prisma-client/client';
-
-// export class UserGroupRepository {
-//   private _prisma: any;
-
-//   constructor(client?: any) {
-//     if (client) {
-//       this._prisma = client;
-//     } else {
-//       this._prisma = prisma;
-//     }
-//   }
-
-//   public async create(data: any): Promise<any> {
-//     return await this._prisma.userGroup.create(data);
-//   }
-
-//   public async findAll(options: any): Promise<any[]> {
-//     return await this._prisma.userGroup.findMany(options);
-//   }
-
-//   public async findOne(options: any): Promise<any> {
-//     return await this._prisma.userGroup.findFirst(options);
-//   }
-
-//   public async update(where: any, data: any): Promise<any> {
-//     return await this._prisma.userGroup.update(where, data);
-//   }
-
-//   public async delete(where: any): Promise<any> {
-//     return await this._prisma.userGroups.delete(where);
-//   }
-// }
-
 import { RepositoryBase, IRepositoryBase } from '@tomei/general';
 
 export class UserGroupRepository

package/src/components/user-user-group/user-user-group.repository.ts

@@ -1,38 +1,4 @@
-import UserUserGroup from 'models/user-user-group.entity';
-import prisma from '../../prisma-client/client';
-
-// export class UserUserGroupRepository {
-//   private _prisma: any;
-
-//   constructor(client?: any) {
-//     if (client) {
-//       this._prisma = client;
-//     } else {
-//       this._prisma = prisma;
-//     }
-//   }
-
-//   public async create(data: any): Promise<any> {
-//     return await this._prisma.userUserGroup.create(data);
-//   }
-
-//   public async findAll(options: any): Promise<any[]> {
-//     return await this._prisma.userUserGroup.findMany(options);
-//   }
-
-//   public async findOne(options: any): Promise<any> {
-//     return await this._prisma.userUserGroup.findFirst(options);
-//   }
-
-//   public async update(where: any, data: any): Promise<any> {
-//     return await this._prisma.userUserGroup.update(where, data);
-//   }
-
-//   public async delete(where: any): Promise<any> {
-//     return await this._prisma.userUserGroup.delete(where);
-//   }
-// }
-
+import UserUserGroup from '../../models/user-user-group.entity';
 import { RepositoryBase, IRepositoryBase } from '@tomei/general';
 
 export class UserUserGroupRepository

package/src/models/building.entity.ts

@@ -1,11 +1,19 @@
 import {
+  BelongsTo,
   Column,
   CreatedAt,
   DataType,
+  ForeignKey,
+  HasMany,
   Model,
   Table,
   UpdatedAt,
 } from 'sequelize-typescript';
+import BuildingType from './building-type.entity';
+import Country from './country.entity';
+import User from './user.entity';
+import Department from './department.entity';
+import Staff from './staff.entity';
 
 @Table({
   tableName: 'sso_buildings',
@@ -37,6 +45,7 @@ export default class Building extends Model {
   })
   Code: string;
 
+  @ForeignKey(() => BuildingType)
   @Column({
     allowNull: false,
     type: DataType.INTEGER,
@@ -100,6 +109,7 @@ export default class Building extends Model {
   })
   PostCode: string;
 
+  @ForeignKey(() => Country)
   @Column({
     allowNull: false,
     type: DataType.INTEGER,
@@ -121,6 +131,7 @@ export default class Building extends Model {
   })
   City: string;
 
+  @ForeignKey(() => User)
   @Column({
     allowNull: true,
     type: DataType.INTEGER,
@@ -128,6 +139,7 @@ export default class Building extends Model {
   })
   CreatedById: number;
 
+  @ForeignKey(() => User)
   @Column({
     allowNull: true,
     type: DataType.INTEGER,
@@ -182,4 +194,22 @@ export default class Building extends Model {
 
   @UpdatedAt
   UpdatedAt: Date;
+
+  @BelongsTo(() => BuildingType)
+  BuildingType: BuildingType;
+
+  @BelongsTo(() => Country)
+  Country: Country;
+
+  @BelongsTo(() => User, 'created_by_id')
+  CreatedBy: User;
+
+  @BelongsTo(() => User, 'updated_by_id')
+  UpdatedBy: User;
+
+  @HasMany(() => Department)
+  Departments: Department[];
+
+  @HasMany(() => Staff)
+  Staffs: Staff[];
 }

package/src/models/user-role.entity.ts

@@ -8,6 +8,7 @@ import {
   UpdatedAt,
 } from 'sequelize-typescript';
 import User from './user.entity';
+import Role from './role.entity';
 
 @Table({
   tableName: 'sso_user_roles',
@@ -17,6 +18,7 @@ import User from './user.entity';
   underscored: true,
 })
 export default class UserRole extends Model {
+  @ForeignKey(() => User)
   @Column({
     primaryKey: true,
     type: DataType.INTEGER,
@@ -25,6 +27,7 @@ export default class UserRole extends Model {
   })
   UserId: number;
 
+  @ForeignKey(() => Role)
   @Column({
     primaryKey: true,
     type: DataType.INTEGER,
@@ -47,4 +50,10 @@ export default class UserRole extends Model {
 
   @BelongsTo(() => User)
   User: User;
+
+  @BelongsTo(() => Role)
+  Role: Role;
+
+  @BelongsTo(() => User, 'updated_by_id')
+  UpdatedBy: User;
 }