@things-factory/organization 7.0.0-alpha.9 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/organization",
-  "version": "7.0.0-alpha.9",
+  "version": "7.0.0",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,14 +27,14 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@operato/app": "^2.0.0-alpha.0",
-    "@operato/contact": "^2.0.0-alpha.0",
-    "@operato/data-tree": "^2.0.0-alpha.0",
-    "@operato/graphql": "^2.0.0-alpha.0",
-    "@operato/shell": "^2.0.0-alpha.0",
-    "@things-factory/auth-base": "^7.0.0-alpha.9",
-    "@things-factory/contact": "^7.0.0-alpha.9",
-    "@things-factory/shell": "^7.0.0-alpha.9"
+    "@operato/app": "^7.0.0",
+    "@operato/contact": "^7.0.0",
+    "@operato/data-tree": "^7.0.0",
+    "@operato/graphql": "^7.0.0",
+    "@operato/shell": "^7.0.0",
+    "@things-factory/auth-base": "^7.0.0",
+    "@things-factory/contact": "^7.0.0",
+    "@things-factory/shell": "^7.0.0"
   },
-  "gitHead": "99fc5aead211b3c82e3ebbf76e8d5d1db01b1ddc"
+  "gitHead": "00f3917ca132679e3571f3f4fd16f4caf84f488e"
 }

package/server/routes.ts

@@ -1,5 +1,3 @@
-const debug = require('debug')('things-factory:organization:routes')
-
 process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRouter) => {
   /*
    * can add global public routes to application (auth not required, tenancy not required)

package/server/service/approval-line/approval-line-query.ts

@@ -83,7 +83,10 @@ export class ApprovalLineQuery {
 
   @Directive('@privilege(category: "organization", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => ApprovalLineList, { description: 'To fetch multiple approval lines' })
-  async approvalLines(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ApprovalLineList> {
+  async approvalLines(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<ApprovalLineList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -99,7 +102,10 @@ export class ApprovalLineQuery {
   }
 
   @Query(returns => ApprovalLineList, { description: 'To fetch referable approval lines for the user' })
-  async approvalLineReferences(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ApprovalLineList> {
+  async approvalLineReferences(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<ApprovalLineList> {
     const { domain, user } = context.state
     const employees = await getRepository(Employee).findBy({
       domain: { id: domain.id },
@@ -129,7 +135,10 @@ export class ApprovalLineQuery {
   }
 
   @Query(returns => ApprovalLineList, { description: 'To fetch approval lines only for to the user' })
-  async myApprovalLines(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ApprovalLineList> {
+  async myApprovalLines(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<ApprovalLineList> {
     const { domain, user } = context.state
     const employees = await getRepository(Employee).findBy({
       domain: { id: domain.id },
@@ -152,7 +161,10 @@ export class ApprovalLineQuery {
   }
 
   @Query(returns => ApprovalLineList, { description: 'To fetch common approval lines' })
-  async commonApprovalLines(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ApprovalLineList> {
+  async commonApprovalLines(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<ApprovalLineList> {
     const { domain, user } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

package/server/service/approval-line/approval-line.ts

@@ -1,4 +1,15 @@
-import { CreateDateColumn, UpdateDateColumn, DeleteDateColumn, Entity, Index, Column, RelationId, ManyToOne, PrimaryGeneratedColumn, VersionColumn } from 'typeorm'
+import {
+  CreateDateColumn,
+  UpdateDateColumn,
+  DeleteDateColumn,
+  Entity,
+  Index,
+  Column,
+  RelationId,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  VersionColumn
+} from 'typeorm'
 import { InputType, ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
 
 import { Domain, ObjectRef } from '@things-factory/shell'
@@ -36,9 +47,18 @@ export class ApprovalLineOwner {
 }
 
 @Entity()
-@Index('ix_approval_line_0', (approvalLine: ApprovalLine) => [approvalLine.domain, approvalLine.ownerType, approvalLine.ownerValue, approvalLine.name], {
-  unique: true
-})
+@Index(
+  'ix_approval_line_0',
+  (approvalLine: ApprovalLine) => [
+    approvalLine.domain,
+    approvalLine.ownerType,
+    approvalLine.ownerValue,
+    approvalLine.name
+  ],
+  {
+    unique: true
+  }
+)
 @ObjectType({ description: 'Entity for ApprovalLine' })
 export class ApprovalLine {
   @PrimaryGeneratedColumn('uuid')
@@ -46,7 +66,7 @@ export class ApprovalLine {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((approvalLine: ApprovalLine) => approvalLine.domain)
@@ -88,14 +108,14 @@ export class ApprovalLine {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((approvalLine: ApprovalLine) => approvalLine.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((approvalLine: ApprovalLine) => approvalLine.updater)

package/server/service/department/department-history.ts

@@ -1,7 +1,12 @@
 import { Field, ID, ObjectType } from 'type-graphql'
 import { Column, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, RelationId } from 'typeorm'
 
-import { HistoryActionColumn, HistoryActionType, HistoryEntityInterface, HistoryOriginalIdColumn } from '@operato/typeorm-history'
+import {
+  HistoryActionColumn,
+  HistoryActionType,
+  HistoryEntityInterface,
+  HistoryOriginalIdColumn
+} from '@operato/typeorm-history'
 import { Role, User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
 import { Domain } from '@things-factory/shell'
@@ -13,10 +18,22 @@ const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
 
 @Entity()
-@Index('ix_department_history_0', (departmentHistory: DepartmentHistory) => [departmentHistory.originalId, departmentHistory.version], { unique: true })
-@Index('ix_department_history_1', (departmentHistory: DepartmentHistory) => [departmentHistory.domain, departmentHistory.originalId, departmentHistory.version], {
-  unique: true
-})
+@Index(
+  'ix_department_history_0',
+  (departmentHistory: DepartmentHistory) => [departmentHistory.originalId, departmentHistory.version],
+  { unique: true }
+)
+@Index(
+  'ix_department_history_1',
+  (departmentHistory: DepartmentHistory) => [
+    departmentHistory.domain,
+    departmentHistory.originalId,
+    departmentHistory.version
+  ],
+  {
+    unique: true
+  }
+)
 @ObjectType({ description: 'History Entity of Department' })
 export class DepartmentHistory implements HistoryEntityInterface<Department> {
   @PrimaryGeneratedColumn('uuid')
@@ -28,7 +45,7 @@ export class DepartmentHistory implements HistoryEntityInterface<Department> {
   version?: number = 1
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((department: Department) => department.domain)
@@ -85,14 +102,14 @@ export class DepartmentHistory implements HistoryEntityInterface<Department> {
   deletedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((department: Department) => department.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((department: Department) => department.updater)
@@ -106,7 +123,12 @@ export class DepartmentHistory implements HistoryEntityInterface<Department> {
 
   @HistoryActionColumn({
     nullable: false,
-    type: DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'enum' : DATABASE_TYPE == 'oracle' ? 'varchar2' : 'smallint',
+    type:
+      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'enum'
+        : DATABASE_TYPE == 'oracle'
+          ? 'varchar2'
+          : 'smallint',
     enum: HistoryActionType
   })
   public action!: HistoryActionType

package/server/service/department/department-query.ts

@@ -10,7 +10,10 @@ import { Employee } from '../employee/employee'
 @Resolver(Department)
 export class DepartmentQuery {
   @Query(returns => DepartmentList, { nullable: true, description: 'To fetch a Root Departments' })
-  async departmentRoots(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DepartmentList> {
+  async departmentRoots(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<DepartmentList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -35,7 +38,10 @@ export class DepartmentQuery {
   }
 
   @Query(returns => DepartmentList, { description: 'To fetch multiple Departments' })
-  async departments(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DepartmentList> {
+  async departments(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<DepartmentList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -71,7 +77,11 @@ export class DepartmentQuery {
   }
 
   @FieldResolver(type => [Department])
-  async children(@Root() department: Department, @Args() params: ListParam, @Ctx() context: ResolverContext): Promise<Department[]> {
+  async children(
+    @Root() department: Department,
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<Department[]> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

package/server/service/department/department.ts

@@ -37,7 +37,7 @@ export class Department {
   version?: number = 1
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((department: Department) => department.domain)
@@ -101,14 +101,14 @@ export class Department {
   deletedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((department: Department) => department.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((department: Department) => department.updater)

package/server/service/employee/employee-history.ts

@@ -42,7 +42,7 @@ export class EmployeeHistory implements HistoryEntityInterface<Employee> {
   version?: number = 1
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((employee: Employee) => employee.domain)
@@ -120,14 +120,14 @@ export class EmployeeHistory implements HistoryEntityInterface<Employee> {
   deletedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((employee: Employee) => employee.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((employee: Employee) => employee.updater)
@@ -159,8 +159,8 @@ export class EmployeeHistory implements HistoryEntityInterface<Employee> {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-        ? 'varchar2'
-        : 'smallint',
+          ? 'varchar2'
+          : 'smallint',
     enum: HistoryActionType
   })
   public action!: HistoryActionType

package/server/service/employee/employee-query.ts

@@ -7,7 +7,7 @@ import { Employee } from './employee'
 import { EmployeeList } from './employee-type'
 import { Department } from '../department/department'
 
-async function getContactItem(contactId: String, type: String, label: String, context: ResolverContext) {
+async function getContactItem(contactId: string, type: string, label: string, context: ResolverContext) {
   const { domain } = context.state
   const contact: Contact = await getRepository(Contact).findOne({ where: { domain: { id: domain.id }, id: contactId } })
   const { items } = contact
@@ -30,7 +30,7 @@ export class EmployeeQuery {
   }
 
   @Query(returns => EmployeeList, { description: 'To fetch multiple Employees' })
-  async employees(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<EmployeeList> {
+  async employees(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<EmployeeList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -41,7 +41,7 @@ export class EmployeeQuery {
     })
 
     const [items, total] = await queryBuilder.getManyAndCount()
-    
+
     return { items, total }
   }
 

package/server/service/employee/employee.ts

@@ -47,7 +47,7 @@ export class Employee {
   version?: number = 1
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((employee: Employee) => employee.domain)
@@ -162,14 +162,14 @@ export class Employee {
   deletedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((employee: Employee) => employee.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((employee: Employee) => employee.updater)