@admin-layout/timetracker-module-server 1.0.3-alpha.7 → 1.0.3-alpha.81

package/lib/interfaces/timerecord-repository.d.ts

@@ -1,12 +1,12 @@
-import { ITimeRecordRequest, ITimeRecord, ITimeTracker } from '@admin-layout/timetracker-core';
+import { ITimeRecordRequest, ITimeRecord } from '@admin-layout/timetracker-core';
 export interface ITimeRecordRepository {
     getTimeRecords(orgId: string, userId?: string, startTime?: Date, endTime?: Date): Promise<Array<ITimeRecord>>;
     getOrganizationTimeRecords(orgId: string): Promise<Array<ITimeRecord>>;
     getPlayingTimeRecord(userId: string, orgId: string): Promise<ITimeRecord>;
-    createTimeRecord(userId: string, orgId: string, request: ITimeRecordRequest): Promise<Partial<ITimeTracker>>;
-    updateTimeRecord(userId: string, orgId: string, recordId: string, request: ITimeRecordRequest): Promise<Partial<ITimeTracker>>;
-    removeTimeRecord(userId: string, orgId: string, recordId: string): Promise<Partial<ITimeTracker>>;
+    createTimeRecord(userId: string, orgId: string, request: ITimeRecordRequest): Promise<Partial<ITimeRecord>>;
+    updateTimeRecord(userId: string, orgId: string, recordId: string, request: ITimeRecordRequest): Promise<Partial<ITimeRecord>>;
+    removeTimeRecord(userId: string, orgId: string, recordId: string): Promise<Partial<ITimeRecord>>;
     removeDurationTimeRecords(userId: string, orgId: string, startTime: Date, endTime: Date, projectId: string): Promise<boolean>;
-    approveTimeRecords(orgId: string, sheetId: string, startDate: Date, endDate: Date): any;
+    approveTimeRecords(orgId: string, sheetId: string, timeRecordsId: string[]): any;
     disapproveTimeRecords(orgId: string, sheetId: string): any;
 }

package/lib/interfaces/timerecord-service.d.ts

@@ -1,12 +1,12 @@
-import { ITimeRecord, ITimeRecordRequest, ITimeTracker } from '@admin-layout/timetracker-core';
+import { ITimeRecord, ITimeRecordRequest } from '@admin-layout/timetracker-core';
 export interface ITimeRecordService {
     getTimeRecords(orgId: string, userId?: string): Promise<Array<ITimeRecord>>;
     getDurationTimeRecords(orgId: string, startTime: Date, endTime: Date, userId?: string): Promise<Array<ITimeRecord>>;
     getPlayingTimeRecord(userId: string, orgId: string): Promise<ITimeRecord>;
-    createTimeRecord(userId: string, orgId: string, request: ITimeRecordRequest): Promise<Partial<ITimeTracker>>;
+    createTimeRecord(userId: string, orgId: string, request: ITimeRecordRequest): Promise<Partial<ITimeRecord>>;
     updateTimeRecord(userId: string, orgId: string, recordId: string, request: ITimeRecordRequest): Promise<boolean>;
     removeTimeRecord(userId: string, orgId: string, recordId: string): Promise<boolean>;
     removeDurationTimeRecords(userId: string, orgId: string, startTime: Date, endTime: Date, projectId: string): Promise<boolean>;
-    approveTimeRecords(orgId: string, sheetId: string, startDate: Date, endDate: Date): any;
+    approveTimeRecords(orgId: string, sheetId: string, timeRecordsId: string[]): any;
     disapproveTimeRecords(orgId: string, sheetId: string): any;
 }

package/lib/interfaces/timesheet-repository.d.ts

@@ -6,4 +6,5 @@ export interface ITimesheetRepository {
     updateTimesheet(orgId: string, sheetId: string, request: ITimesheetCreateRequest): any;
     updateTimesheetStatus(orgId: string, sheetId: string, state: ITimesheetState): any;
     removeTimesheet(userId: string, orgId: string, sheetId: string): Promise<boolean>;
+    removeTimeRecordIdFromTimesheet(recordId: string, orgId: string): Promise<boolean>;
 }

package/lib/interfaces/timesheet-service.d.ts

@@ -7,4 +7,5 @@ export interface ITimesheetService {
     updateTimesheet(userId: string, orgId: string, sheetId: string, request: ITimesheetCreateRequest, userContext?: any): Promise<boolean>;
     updateTimesheetStatus(orgId: string, sheetId: string, state: ITimesheetState): Promise<boolean>;
     removeTimesheet(userId: string, orgId: string, sheetId: string): Promise<boolean>;
+    removeTimeRecordIdFromTimesheet(recordId: string, orgId: string): Promise<boolean>;
 }

package/lib/plugins/index.d.ts

@@ -0,0 +1,2 @@
+export * from './timesheet-moleculer-service';
+export * from './timerecord-moleculer-service';

package/lib/plugins/timerecord-moleculer-service.d.ts

@@ -0,0 +1,8 @@
+import { Service, ServiceBroker } from 'moleculer';
+import { Container } from 'inversify';
+export declare class TimeRecordMoleculerService extends Service {
+    private timerecordService;
+    constructor(broker: ServiceBroker, { container, ...settings }: {
+        container: Container;
+    });
+}

package/lib/plugins/timesheet-moleculer-service.d.ts

@@ -0,0 +1,9 @@
+import { Service, ServiceBroker } from 'moleculer';
+import { Container } from 'inversify';
+export declare class TimesheetMoleculerService extends Service {
+    private timesheetService;
+    private container;
+    constructor(broker: ServiceBroker, { container, ...settings }: {
+        container: Container;
+    });
+}

package/lib/preferences/permissions/timing-roles-permission-overwrite.d.ts

@@ -1,5 +1,4 @@
 import { IPermissionType } from '@adminide-stack/core';
-import { IPreDefineAccountPermissions } from '../../constants';
 export declare const TimeTrackerRolesPermissionOverwrite: {
     OWNER: {
         "organization.timetracker.self.view": IPermissionType;

package/lib/services/index.d.ts

@@ -1,2 +1,4 @@
 export * from './timesheet-service';
 export * from './timerecord-service';
+export * from './timerecord-proxy-service';
+export * from './timesheet-proxy-service';

package/lib/services/timerecord-proxy-service.d.ts

@@ -0,0 +1,20 @@
+import { ServiceBroker } from 'moleculer';
+import * as Logger from 'bunyan';
+import { ITimeRecord, ITimeRecordRequest } from '@admin-layout/timetracker-core';
+import { ITimeRecordService } from '../interfaces';
+export declare class TimeRecordProxyService implements ITimeRecordService {
+    broker: ServiceBroker;
+    private logger;
+    private topic;
+    constructor(broker: ServiceBroker, logger: Logger);
+    approveTimeRecords(orgId: string, sheetId: string, timeRecordsId: string[]): Promise<unknown>;
+    createTimeRecord(userId: string, orgId: string, request: ITimeRecordRequest): Promise<Partial<ITimeRecord>>;
+    disapproveTimeRecords(orgId: string, sheetId: string): Promise<unknown>;
+    getDurationTimeRecords(orgId: string, startTime: Date, endTime: Date, userId?: string): Promise<Array<ITimeRecord>>;
+    getPlayingTimeRecord(userId: string, orgId: string): Promise<ITimeRecord>;
+    getTimeRecords(orgId: string, userId?: string): Promise<Array<ITimeRecord>>;
+    removeDurationTimeRecords(userId: string, orgId: string, startTime: Date, endTime: Date, projectId: string): Promise<boolean>;
+    removeTimeRecord(userId: string, orgId: string, recordId: string): Promise<boolean>;
+    updateTimeRecord(userId: string, orgId: string, recordId: string, request: ITimeRecordRequest): Promise<boolean>;
+    private callAction;
+}

package/lib/services/timerecord-service.d.ts

@@ -1,17 +1,15 @@
 import { CdmLogger } from '@cdm-logger/core';
 import { ITimeRecord, ITimeRecordRequest } from '@admin-layout/timetracker-core';
-import { IPreferencesService } from '@adminide-stack/core';
 import { PubSubEngine } from 'graphql-subscriptions';
 import { ServiceBroker } from 'moleculer';
 import { ITimeRecordRepository } from '../interfaces';
 import { ITimeRecordService } from '../interfaces/timerecord-service';
 export declare class TimeRecordService implements ITimeRecordService {
     protected timeRecordRepository: ITimeRecordRepository;
-    private preferencesService;
     private broker;
     private pubsub;
     private logger;
-    constructor(timeRecordRepository: ITimeRecordRepository, preferencesService: IPreferencesService, broker: ServiceBroker, pubsub: PubSubEngine, logger: CdmLogger.ILogger);
+    constructor(timeRecordRepository: ITimeRecordRepository, broker: ServiceBroker, pubsub: PubSubEngine, logger: CdmLogger.ILogger);
     getTimeRecords(orgId: string, userId: string): Promise<Array<ITimeRecord>>;
     getDurationTimeRecords(orgId: string, startTime: Date, endTime: Date, userId?: string): Promise<Array<ITimeRecord>>;
     getPlayingTimeRecord(userId: string, orgId: string): Promise<ITimeRecord>;
@@ -19,6 +17,6 @@ export declare class TimeRecordService implements ITimeRecordService {
     updateTimeRecord(userId: string, orgId: string, recordId: string, request: ITimeRecordRequest): Promise<boolean>;
     removeTimeRecord(userId: string, orgId: string, recordId: string): Promise<boolean>;
     removeDurationTimeRecords(userId: string, orgId: string, startTime: Date, endTime: Date, projectId: string): Promise<boolean>;
-    approveTimeRecords(orgId: string, sheetId: string, startDate: Date, endDate: Date): Promise<void>;
+    approveTimeRecords(orgId: string, sheetId: string, timeRecordsId: string[]): Promise<void>;
     disapproveTimeRecords(orgId: string, sheetId: string): Promise<void>;
 }

package/lib/services/timesheet-proxy-service.d.ts

@@ -0,0 +1,19 @@
+import { ServiceBroker } from 'moleculer';
+import * as Logger from 'bunyan';
+import { ITimesheetCreateRequest, ITimesheet, ITimesheetState } from '@admin-layout/timetracker-core';
+import { ITimesheetService } from '../interfaces';
+export declare class TimesheetProxyService implements ITimesheetService {
+    broker: ServiceBroker;
+    private logger;
+    private topic;
+    constructor(broker: ServiceBroker, logger: Logger);
+    createTimesheet(userId: string, orgId: string, request: ITimesheetCreateRequest): Promise<boolean>;
+    getDurationTimesheets(orgId: string, start: Date, end: Date): Promise<Array<ITimesheet>>;
+    getTimesheets(orgId: string): Promise<Array<ITimesheet>>;
+    getTimesheetsWithTotalHours(orgId: string, userId?: string): Promise<Array<ITimesheet>>;
+    removeTimesheet(userId: string, orgId: string, sheetId: string): Promise<boolean>;
+    removeTimeRecordIdFromTimesheet(recordId: string, orgId: string): Promise<boolean>;
+    updateTimesheet(userId: string, orgId: string, sheetId: string, request: ITimesheetCreateRequest, userContext?: any): Promise<boolean>;
+    updateTimesheetStatus(orgId: string, sheetId: string, state: ITimesheetState): Promise<boolean>;
+    private callAction;
+}

package/lib/services/timesheet-service.d.ts

@@ -13,7 +13,7 @@ export declare class TimesheetService implements ITimesheetService {
     private settings;
     private logger;
     constructor(timesheetRepository: ITimesheetRepository, timeRecordRepository: ITimeRecordRepository, timeRecordService: ITimeRecordRepository, preferencesService: IPreferencesService, broker: ServiceBroker, settings: any, logger: ILogger);
-    getTimesheets(orgId: string, userId?: string): Promise<import("../../../core/lib").ITimesheet[]>;
+    getTimesheets(orgId: string, userId?: string): Promise<import("@admin-layout/timetracker-core").ITimesheet[]>;
     getTimesheetsWithTotalHours(orgId: string, userId?: string): Promise<{
         id: string;
         startDate: any;
@@ -26,13 +26,15 @@ export declare class TimesheetService implements ITimesheetService {
         submittedOn: any;
         updatedBy: string;
         updatedOn: any;
+        timeRecordsId: string[];
         totalDuration: number;
     }[]>;
-    getDurationTimesheets(orgId: string, start: Date, end: Date): Promise<import("../../../core/lib").ITimesheet[]>;
+    getDurationTimesheets(orgId: string, start: Date, end: Date): Promise<import("@admin-layout/timetracker-core").ITimesheet[]>;
     createTimesheet(userId: string, orgId: string, request: ITimesheetCreateRequest): Promise<boolean>;
     updateTimesheet(userId: string, orgId: string, sheetId: string, request: ITimesheetCreateRequest, userContext?: any): Promise<boolean>;
     updateTimesheetStatus(orgId: string, sheetId: string, state: ITimesheetState): Promise<boolean>;
     removeTimesheet(userId: string, orgId: string, sheetId: string): Promise<boolean>;
     private sendMail;
+    removeTimeRecordIdFromTimesheet(recordId: string, orgId: string): Promise<boolean>;
     private callAction;
 }

package/lib/store/models/timerecords-model.d.ts

@@ -0,0 +1,8 @@
+import { Model, Document, Connection } from 'mongoose';
+import { ITimeRecord } from '@admin-layout/timetracker-core';
+export declare type Maybe<T> = T | null;
+export interface ITimeRecordModel extends ITimeRecord, Document {
+    id?: any;
+}
+export declare type TimeRecordsModelType = Model<ITimeRecordModel>;
+export declare const TimeRecordsModelFunc: (db: Connection) => TimeRecordsModelType;

package/lib/store/models/timesheets-model.d.ts

@@ -0,0 +1,8 @@
+import { Model, Document, Connection } from 'mongoose';
+import { ITimesheet } from '@admin-layout/timetracker-core';
+export declare type Maybe<T> = T | null;
+export interface ITimeSheetModel extends ITimesheet, Document {
+    id?: any;
+}
+export declare type TimesheetsModelType = Model<ITimeSheetModel>;
+export declare const TimesheetsModelFunc: (db: Connection) => TimesheetsModelType;

package/lib/store/repository/timerecord-repository.d.ts

@@ -1,23 +1,23 @@
 import * as Logger from 'bunyan';
 import * as mongoose from 'mongoose';
-import { ITimeRecordRequest, ITimeRecord, ITimeTracker } from '@admin-layout/timetracker-core';
-import { ITimeRecordModel, ITimeTrackerModel } from '../models/timetracker-model';
+import { ITimeRecordRequest, ITimeRecord } from '@admin-layout/timetracker-core';
 import { ITimeRecordRepository } from '../../interfaces';
+import { ITimeRecordModel } from '../models/timerecords-model';
 export declare class TimeRecordRepository implements ITimeRecordRepository {
-    private timeTrackerModel;
+    private timeRecordsModel;
     private logger;
     constructor(db: mongoose.Connection, logger: Logger);
-    getTimeRecords(orgId: string, userId?: string | RegExp, from?: Date, until?: Date): Promise<any>;
+    getTimeRecords(orgId: string, userId?: string | RegExp, from?: Date, until?: Date): Promise<Array<ITimeRecord>>;
     getOrganizationTimeRecords(orgId: string): Promise<ITimeRecordModel[]>;
     getPlayingTimeRecord(userId: string, orgId: string): Promise<ITimeRecord>;
-    createTimeRecord(userId: string, orgId: string, request: ITimeRecordRequest): Promise<Partial<ITimeTracker>>;
-    updateTimeRecord(userId: string, orgId: string, recordId: string, request: ITimeRecordRequest): Promise<Partial<ITimeTrackerModel>>;
+    createTimeRecord(userId: string, orgId: string, request: ITimeRecordRequest): Promise<Partial<ITimeRecord>>;
+    updateTimeRecord(userId: string, orgId: string, recordId: string, request: ITimeRecordRequest): Promise<Partial<ITimeRecordModel>>;
     removeTimeRecord(userId: string, orgId: string, recordId: string): Promise<{
         userId: string;
         orgId: string;
-        timeRecords: ITimeRecord[];
+        _id: string;
     }>;
     removeDurationTimeRecords(userId: string, orgId: string, startTime: Date, endTime: Date, projectId: string): Promise<boolean>;
-    approveTimeRecords(orgId: string, sheetId: string, startDate: Date, endDate: Date): Promise<void>;
+    approveTimeRecords(orgId: string, sheetId: string, timeRecordsId: string[]): Promise<void>;
     disapproveTimeRecords(orgId: string, sheetId: string): Promise<void>;
 }

package/lib/store/repository/timesheet-repository.d.ts

@@ -2,11 +2,11 @@ import * as Logger from 'bunyan';
 import * as mongoose from 'mongoose';
 import { ITimesheetCreateRequest, ITimesheetState } from '@admin-layout/timetracker-core';
 import { ServiceBroker } from 'moleculer';
-import { ITimeSheetModel } from '../models/timetracker-model';
+import { ITimeSheetModel } from '../models/timesheets-model';
 import { ITimesheetRepository } from '../../interfaces';
 export declare class TimesheetRepository implements ITimesheetRepository {
     private broker;
-    private timeTrackerModel;
+    private timesheetsModel;
     private logger;
     constructor(db: mongoose.Connection, logger: Logger, broker: ServiceBroker);
     getOrganizationTimesheets(orgId: string): Promise<ITimeSheetModel[]>;
@@ -15,4 +15,5 @@ export declare class TimesheetRepository implements ITimesheetRepository {
     updateTimesheet(orgId: string, sheetId: string, request: ITimesheetCreateRequest): Promise<mongoose.UpdateWriteOpResult>;
     updateTimesheetStatus(orgId: string, sheetId: string, state: ITimesheetState): Promise<mongoose.UpdateWriteOpResult>;
     removeTimesheet(userId: string, orgId: string, sheetId: string): Promise<boolean>;
+    removeTimeRecordIdFromTimesheet(recordId: string, orgId: string): Promise<boolean>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@admin-layout/timetracker-module-server",
-  "version": "1.0.3-alpha.7",
+  "version": "1.0.3-alpha.81",
   "description": "Sample core for higher packages to depend on",
   "license": "ISC",
   "author": "CDMBase LLC",
@@ -13,8 +13,6 @@
     "build:lib:watch": "npm run build:lib -- --watch",
     "jest": "./node_modules/.bin/jest",
     "prepublish": "npm run build",
-    "schema:download": "./node_modules/.bin/apollo-codegen download-schema http://localhost:8080/graphql --output schema.json ",
-    "schema:generate": "./node_modules/.bin/apollo-codegen generate src/browser/graphql/**/*.graphql --schema schema.json --target typescript --output src/browser/types/schema.ts",
     "test": "cross-env ENV_FILE=../../config/test/test.env jest",
     "test:debug": "npm test -- --runInBand",
     "test:watch": "npm test -- --watch",
@@ -40,15 +38,16 @@
     }
   },
   "dependencies": {
-    "@admin-layout/timetracker-core": "1.0.3-alpha.2",
+    "@admin-layout/timetracker-core": "1.0.3-alpha.78",
     "@container-stack/mailing-api": "^0.0.26-61",
     "humanize-duration": "^3.24.0",
     "moment": "^2.29.1"
   },
   "peerDependencies": {
     "@adminide-stack/core": "*",
+    "@adminide-stack/platform-server": "*",
     "@common-stack/core": "*",
-    "@common-stack/server-core": ">=0.1.7",
+    "@common-stack/server-core": ">=0.1.11",
     "@vscode-alt/monaco-editor": "*",
     "bunyan": "*",
     "inversify": "*",
@@ -62,5 +61,5 @@
   "typescript": {
     "definition": "lib/index.d.ts"
   },
-  "gitHead": "300a5bd3c146c703fc2895aca0318012e7edb094"
+  "gitHead": "2b92540429feec9f4cfbdaaefeb142e2d0c9b257"
 }