@machinemetrics/mm-erp-sdk 0.1.7-beta.2 → 0.1.8-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (56) hide show
  1. package/dist/{config-qat9zgOl.js → config-CV-KosWV.js} +2 -2
  2. package/dist/{config-qat9zgOl.js.map → config-CV-KosWV.js.map} +1 -1
  3. package/dist/{connector-factory-C2czCs9v.js → connector-factory-D8v6aQIt.js} +2 -2
  4. package/dist/{connector-factory-C2czCs9v.js.map → connector-factory-D8v6aQIt.js.map} +1 -1
  5. package/dist/{hashed-cache-manager-CzyFSt2B.js → hashed-cache-manager-B6hTDLxU.js} +4 -4
  6. package/dist/{hashed-cache-manager-CzyFSt2B.js.map → hashed-cache-manager-B6hTDLxU.js.map} +1 -1
  7. package/dist/{index-B9wo8pld.js → index-Bg76oouR.js} +2 -2
  8. package/dist/{index-B9wo8pld.js.map → index-Bg76oouR.js.map} +1 -1
  9. package/dist/index.d.ts +3 -5
  10. package/dist/index.d.ts.map +1 -1
  11. package/dist/{logger-Db8CkwR6.js → logger-SqdNut1H.js} +1040 -934
  12. package/dist/logger-SqdNut1H.js.map +1 -0
  13. package/dist/mm-erp-sdk.js +14 -268
  14. package/dist/mm-erp-sdk.js.map +1 -1
  15. package/dist/services/data-sync-service/data-sync-service.d.ts.map +1 -1
  16. package/dist/services/data-sync-service/jobs/clean-up-expired-cache.js +4 -4
  17. package/dist/services/data-sync-service/jobs/from-erp.d.ts.map +1 -1
  18. package/dist/services/data-sync-service/jobs/from-erp.js +8 -25
  19. package/dist/services/data-sync-service/jobs/from-erp.js.map +1 -1
  20. package/dist/services/data-sync-service/jobs/retry-failed-labor-tickets.js +3 -3
  21. package/dist/services/data-sync-service/jobs/run-migrations.js +1 -1
  22. package/dist/services/data-sync-service/jobs/to-erp.d.ts.map +1 -1
  23. package/dist/services/data-sync-service/jobs/to-erp.js +7 -24
  24. package/dist/services/data-sync-service/jobs/to-erp.js.map +1 -1
  25. package/dist/services/reporting-service/logger.d.ts.map +1 -1
  26. package/dist/types/erp-types.d.ts +1 -2
  27. package/dist/types/erp-types.d.ts.map +1 -1
  28. package/package.json +1 -3
  29. package/src/index.ts +5 -27
  30. package/src/services/data-sync-service/data-sync-service.ts +3 -38
  31. package/src/services/data-sync-service/jobs/from-erp.ts +6 -35
  32. package/src/services/data-sync-service/jobs/to-erp.ts +5 -35
  33. package/src/services/reporting-service/logger.ts +86 -11
  34. package/src/types/erp-types.ts +0 -1
  35. package/dist/logger-Db8CkwR6.js.map +0 -1
  36. package/dist/services/psql-erp-service/configuration.d.ts +0 -10
  37. package/dist/services/psql-erp-service/configuration.d.ts.map +0 -1
  38. package/dist/services/psql-erp-service/index.d.ts +0 -19
  39. package/dist/services/psql-erp-service/index.d.ts.map +0 -1
  40. package/dist/services/psql-erp-service/internal/psql-config.d.ts +0 -28
  41. package/dist/services/psql-erp-service/internal/psql-config.d.ts.map +0 -1
  42. package/dist/services/psql-erp-service/internal/psql-labor-ticket-operations.d.ts +0 -40
  43. package/dist/services/psql-erp-service/internal/psql-labor-ticket-operations.d.ts.map +0 -1
  44. package/dist/services/psql-erp-service/internal/types/psql-types.d.ts +0 -15
  45. package/dist/services/psql-erp-service/internal/types/psql-types.d.ts.map +0 -1
  46. package/dist/services/psql-erp-service/psql-helpers.d.ts +0 -32
  47. package/dist/services/psql-erp-service/psql-helpers.d.ts.map +0 -1
  48. package/dist/services/psql-erp-service/psql-service.d.ts +0 -36
  49. package/dist/services/psql-erp-service/psql-service.d.ts.map +0 -1
  50. package/src/services/psql-erp-service/configuration.ts +0 -9
  51. package/src/services/psql-erp-service/index.ts +0 -28
  52. package/src/services/psql-erp-service/internal/psql-config.ts +0 -13
  53. package/src/services/psql-erp-service/internal/psql-labor-ticket-operations.ts +0 -58
  54. package/src/services/psql-erp-service/internal/types/psql-types.ts +0 -17
  55. package/src/services/psql-erp-service/psql-helpers.ts +0 -90
  56. package/src/services/psql-erp-service/psql-service.ts +0 -178
@@ -1,10 +0,0 @@
1
- export interface PsqlConfiguration {
2
- host: string;
3
- port: string;
4
- database: string;
5
- username: string;
6
- password: string;
7
- connectionTimeout?: string;
8
- requestTimeout?: string;
9
- }
10
- //# sourceMappingURL=configuration.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../src/services/psql-erp-service/configuration.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB"}
@@ -1,19 +0,0 @@
1
- import { PsqlService } from "./psql-service";
2
- import { PsqlLaborTicketOperations } from "./internal/psql-labor-ticket-operations";
3
- /**
4
- * A class to manage interactions with PSQL (Pervasive) databases via ODBC
5
- */
6
- export { PsqlService };
7
- /**
8
- * Labor ticket operations for PSQL (Phase 2)
9
- */
10
- export { PsqlLaborTicketOperations };
11
- /**
12
- * Configuration interface for PSQL connections
13
- */
14
- export type { PsqlConfiguration } from "./configuration";
15
- /**
16
- * Helper functions for PSQL data formatting
17
- */
18
- export { formatPsqlDate, formatPsqlTime, combinePsqlDateTime, isPsqlDateEmpty, cleanPsqlCharField, } from "./psql-helpers";
19
- //# sourceMappingURL=index.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/psql-erp-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AAEpF;;GAEG;AACH,OAAO,EAAE,WAAW,EAAE,CAAC;AAEvB;;GAEG;AACH,OAAO,EAAE,yBAAyB,EAAE,CAAC;AAErC;;GAEG;AACH,YAAY,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEzD;;GAEG;AACH,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,kBAAkB,GACnB,MAAM,gBAAgB,CAAC"}
@@ -1,28 +0,0 @@
1
- import { z } from "zod";
2
- export declare const PsqlConfigSchema: z.ZodObject<{
3
- host: z.ZodString;
4
- port: z.ZodString;
5
- database: z.ZodString;
6
- username: z.ZodString;
7
- password: z.ZodString;
8
- connectionTimeout: z.ZodDefault<z.ZodOptional<z.ZodString>>;
9
- requestTimeout: z.ZodDefault<z.ZodOptional<z.ZodString>>;
10
- }, "strip", z.ZodTypeAny, {
11
- password: string;
12
- database: string;
13
- port: string;
14
- connectionTimeout: string;
15
- requestTimeout: string;
16
- host: string;
17
- username: string;
18
- }, {
19
- password: string;
20
- database: string;
21
- port: string;
22
- host: string;
23
- username: string;
24
- connectionTimeout?: string | undefined;
25
- requestTimeout?: string | undefined;
26
- }>;
27
- export type PsqlConfig = z.infer<typeof PsqlConfigSchema>;
28
- //# sourceMappingURL=psql-config.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"psql-config.d.ts","sourceRoot":"","sources":["../../../../src/services/psql-erp-service/internal/psql-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;EAQ3B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC"}
@@ -1,40 +0,0 @@
1
- /**
2
- * PSQL Labor Ticket Operations
3
- *
4
- * Phase 2: This will handle INSERT/UPDATE/DELETE operations for labor tickets
5
- * Phase 1: Placeholder - throws errors if called
6
- */
7
- import { PsqlService } from "../psql-service";
8
- import { MMReceiveLaborTicket } from "../../../services/mm-api-service";
9
- export declare class PsqlLaborTicketOperations {
10
- private service;
11
- constructor(service: PsqlService);
12
- /**
13
- * Create labor ticket in START_LABOR table
14
- *
15
- * Phase 2 Implementation Notes:
16
- * - Will use prepared statements with parameter binding
17
- * - Insert into START_LABOR table
18
- * - Return GUID as erpUid
19
- *
20
- * @param laborTicket Labor ticket from MachineMetrics
21
- * @returns Labor ticket and ERP unique ID
22
- */
23
- createLaborTicket(laborTicket: MMReceiveLaborTicket): Promise<{
24
- laborTicket: MMReceiveLaborTicket;
25
- erpUid: string;
26
- }>;
27
- /**
28
- * Update labor ticket (move from START_LABOR to COMPLETED_LABOR)
29
- *
30
- * Phase 2 Implementation Notes:
31
- * - Insert into COMPLETED_LABOR
32
- * - Delete from START_LABOR
33
- * - Should be done in a transaction
34
- *
35
- * @param laborTicket Labor ticket to update
36
- * @returns Updated labor ticket
37
- */
38
- updateLaborTicket(laborTicket: MMReceiveLaborTicket): Promise<MMReceiveLaborTicket>;
39
- }
40
- //# sourceMappingURL=psql-labor-ticket-operations.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"psql-labor-ticket-operations.d.ts","sourceRoot":"","sources":["../../../../src/services/psql-erp-service/internal/psql-labor-ticket-operations.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAGxE,qBAAa,yBAAyB;IACxB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,WAAW;IAExC;;;;;;;;;;OAUG;IACG,iBAAiB,CACrB,WAAW,EAAE,oBAAoB,GAChC,OAAO,CAAC;QAAE,WAAW,EAAE,oBAAoB,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IASjE;;;;;;;;;;OAUG;IACG,iBAAiB,CACrB,WAAW,EAAE,oBAAoB,GAChC,OAAO,CAAC,oBAAoB,CAAC;CAQjC"}
@@ -1,15 +0,0 @@
1
- /**
2
- * PSQL-specific type definitions
3
- */
4
- export interface PsqlConnectionOptions {
5
- connectionString: string;
6
- }
7
- export interface OdbcError {
8
- state: string;
9
- message: string;
10
- code?: number;
11
- }
12
- export interface OdbcErrorResponse extends Error {
13
- odbcErrors?: OdbcError[];
14
- }
15
- //# sourceMappingURL=psql-types.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"psql-types.d.ts","sourceRoot":"","sources":["../../../../../src/services/psql-erp-service/internal/types/psql-types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAkB,SAAQ,KAAK;IAC9C,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;CAC1B"}
@@ -1,32 +0,0 @@
1
- /**
2
- * Helper functions for PSQL/Pervasive database operations
3
- */
4
- /**
5
- * Formats a date from PSQL YYMMDD format to ISO date string
6
- * @param psqlDate Date in YYMMDD format (e.g., "250105" for Jan 5, 2025)
7
- * @returns ISO date string (e.g., "2025-01-05") or null if invalid
8
- */
9
- export declare function formatPsqlDate(psqlDate: string): string | null;
10
- /**
11
- * Formats a time from PSQL HHMM format to HH:MM:SS
12
- * @param psqlTime Time in HHMM format (e.g., "1430" for 2:30 PM)
13
- * @returns Time string in HH:MM:SS format or null if invalid
14
- */
15
- export declare function formatPsqlTime(psqlTime: string): string | null;
16
- /**
17
- * Combines PSQL date and time into ISO datetime string
18
- * @param psqlDate Date in YYMMDD format
19
- * @param psqlTime Time in HHMM format
20
- * @returns ISO datetime string or null if invalid
21
- */
22
- export declare function combinePsqlDateTime(psqlDate: string, psqlTime: string): string | null;
23
- /**
24
- * Helper to check if a PSQL date is "empty" (000000 or blank)
25
- */
26
- export declare function isPsqlDateEmpty(psqlDate: string): boolean;
27
- /**
28
- * Clean and trim PSQL CHAR field (removes trailing spaces)
29
- * PSQL CHAR fields are fixed-width and padded with spaces
30
- */
31
- export declare function cleanPsqlCharField(value: string | null | undefined): string;
32
- //# sourceMappingURL=psql-helpers.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"psql-helpers.d.ts","sourceRoot":"","sources":["../../../src/services/psql-erp-service/psql-helpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAuB9D;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAY9D;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,MAAM,GAAG,IAAI,CASf;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAK3E"}
@@ -1,36 +0,0 @@
1
- import { PsqlConfiguration } from "./configuration";
2
- import { ERPResponse } from "../../types/erp-types";
3
- type PagingParams = {
4
- limit?: number;
5
- offset?: number;
6
- };
7
- export declare class PsqlService {
8
- private config;
9
- constructor(config: PsqlConfiguration);
10
- /**
11
- * Build PSQL ODBC connection string
12
- * CRITICAL: ServerName must use IP.PORT format (e.g., 10.4.0.11.1583)
13
- */
14
- private buildConnectionString;
15
- /**
16
- * Execute a query and return the results
17
- * Creates a fresh connection for each query to avoid handle corruption
18
- *
19
- * @param query The SQL query to execute
20
- * @param params Query parameters (currently unused for PSQL read operations)
21
- * @param paging Optional paging parameters
22
- * @returns The entities fetched from the database, along with paging information
23
- */
24
- executePreparedStatement(query: string, params?: Record<string, string>, paging?: PagingParams): Promise<ERPResponse | undefined>;
25
- /**
26
- * Transform ODBC result set to array of Record<string, string> instances.
27
- * IMPORTANT: PSQL CHAR fields are often padded with spaces - we trim them
28
- */
29
- static recordsetToRecords(recordset: any[]): Record<string, string>[];
30
- /**
31
- * Handle ODBC errors and provide meaningful messages
32
- */
33
- private handleOdbcError;
34
- }
35
- export {};
36
- //# sourceMappingURL=psql-service.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"psql-service.d.ts","sourceRoot":"","sources":["../../../src/services/psql-erp-service/psql-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD,KAAK,YAAY,GAAG;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAoB;gBAEtB,MAAM,EAAE,iBAAiB;IASrC;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAe7B;;;;;;;;OAQG;IACU,wBAAwB,CACnC,KAAK,EAAE,MAAM,EACb,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACnC,MAAM,CAAC,EAAE,YAAY,GACpB,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAqEnC;;;OAGG;WACW,kBAAkB,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;IAkB5E;;OAEG;IACH,OAAO,CAAC,eAAe;CA4BxB"}
@@ -1,9 +0,0 @@
1
- export interface PsqlConfiguration {
2
- host: string;
3
- port: string;
4
- database: string;
5
- username: string;
6
- password: string;
7
- connectionTimeout?: string;
8
- requestTimeout?: string;
9
- }
@@ -1,28 +0,0 @@
1
- import { PsqlService } from "./psql-service";
2
- import { PsqlLaborTicketOperations } from "./internal/psql-labor-ticket-operations";
3
-
4
- /**
5
- * A class to manage interactions with PSQL (Pervasive) databases via ODBC
6
- */
7
- export { PsqlService };
8
-
9
- /**
10
- * Labor ticket operations for PSQL (Phase 2)
11
- */
12
- export { PsqlLaborTicketOperations };
13
-
14
- /**
15
- * Configuration interface for PSQL connections
16
- */
17
- export type { PsqlConfiguration } from "./configuration";
18
-
19
- /**
20
- * Helper functions for PSQL data formatting
21
- */
22
- export {
23
- formatPsqlDate,
24
- formatPsqlTime,
25
- combinePsqlDateTime,
26
- isPsqlDateEmpty,
27
- cleanPsqlCharField,
28
- } from "./psql-helpers";
@@ -1,13 +0,0 @@
1
- import { z } from "zod";
2
-
3
- export const PsqlConfigSchema = z.object({
4
- host: z.string().nonempty("Host is required."),
5
- port: z.string().nonempty("Port is required."),
6
- database: z.string().nonempty("Database name is required."),
7
- username: z.string().nonempty("Username is required."),
8
- password: z.string().nonempty("Password is required."),
9
- connectionTimeout: z.string().optional().default("15000"),
10
- requestTimeout: z.string().optional().default("15000"),
11
- });
12
-
13
- export type PsqlConfig = z.infer<typeof PsqlConfigSchema>;
@@ -1,58 +0,0 @@
1
- /**
2
- * PSQL Labor Ticket Operations
3
- *
4
- * Phase 2: This will handle INSERT/UPDATE/DELETE operations for labor tickets
5
- * Phase 1: Placeholder - throws errors if called
6
- */
7
-
8
- import { PsqlService } from "../psql-service";
9
- import { MMReceiveLaborTicket } from "../../../services/mm-api-service";
10
- import logger from "../../reporting-service/logger";
11
-
12
- export class PsqlLaborTicketOperations {
13
- constructor(private service: PsqlService) {}
14
-
15
- /**
16
- * Create labor ticket in START_LABOR table
17
- *
18
- * Phase 2 Implementation Notes:
19
- * - Will use prepared statements with parameter binding
20
- * - Insert into START_LABOR table
21
- * - Return GUID as erpUid
22
- *
23
- * @param laborTicket Labor ticket from MachineMetrics
24
- * @returns Labor ticket and ERP unique ID
25
- */
26
- async createLaborTicket(
27
- laborTicket: MMReceiveLaborTicket
28
- ): Promise<{ laborTicket: MMReceiveLaborTicket; erpUid: string }> {
29
- logger.warn(
30
- "PsqlLaborTicketOperations.createLaborTicket not yet implemented (Phase 2)"
31
- );
32
- throw new Error(
33
- "Labor ticket creation not implemented for PSQL. This is a Phase 2 feature."
34
- );
35
- }
36
-
37
- /**
38
- * Update labor ticket (move from START_LABOR to COMPLETED_LABOR)
39
- *
40
- * Phase 2 Implementation Notes:
41
- * - Insert into COMPLETED_LABOR
42
- * - Delete from START_LABOR
43
- * - Should be done in a transaction
44
- *
45
- * @param laborTicket Labor ticket to update
46
- * @returns Updated labor ticket
47
- */
48
- async updateLaborTicket(
49
- laborTicket: MMReceiveLaborTicket
50
- ): Promise<MMReceiveLaborTicket> {
51
- logger.warn(
52
- "PsqlLaborTicketOperations.updateLaborTicket not yet implemented (Phase 2)"
53
- );
54
- throw new Error(
55
- "Labor ticket update not implemented for PSQL. This is a Phase 2 feature."
56
- );
57
- }
58
- }
@@ -1,17 +0,0 @@
1
- /**
2
- * PSQL-specific type definitions
3
- */
4
-
5
- export interface PsqlConnectionOptions {
6
- connectionString: string;
7
- }
8
-
9
- export interface OdbcError {
10
- state: string;
11
- message: string;
12
- code?: number;
13
- }
14
-
15
- export interface OdbcErrorResponse extends Error {
16
- odbcErrors?: OdbcError[];
17
- }
@@ -1,90 +0,0 @@
1
- /**
2
- * Helper functions for PSQL/Pervasive database operations
3
- */
4
-
5
- /**
6
- * Formats a date from PSQL YYMMDD format to ISO date string
7
- * @param psqlDate Date in YYMMDD format (e.g., "250105" for Jan 5, 2025)
8
- * @returns ISO date string (e.g., "2025-01-05") or null if invalid
9
- */
10
- export function formatPsqlDate(psqlDate: string): string | null {
11
- if (!psqlDate || psqlDate === "000000" || psqlDate.trim() === "") {
12
- return null;
13
- }
14
-
15
- try {
16
- const year = parseInt(psqlDate.substring(0, 2), 10);
17
- const month = parseInt(psqlDate.substring(2, 4), 10);
18
- const day = parseInt(psqlDate.substring(4, 6), 10);
19
-
20
- // Convert 2-digit year to 4-digit (assuming 2000s)
21
- const fullYear = year + 2000;
22
-
23
- // Basic validation
24
- if (month < 1 || month > 12 || day < 1 || day > 31) {
25
- return null;
26
- }
27
-
28
- const date = new Date(fullYear, month - 1, day);
29
- return date.toISOString().split("T")[0];
30
- } catch (error) {
31
- return null;
32
- }
33
- }
34
-
35
- /**
36
- * Formats a time from PSQL HHMM format to HH:MM:SS
37
- * @param psqlTime Time in HHMM format (e.g., "1430" for 2:30 PM)
38
- * @returns Time string in HH:MM:SS format or null if invalid
39
- */
40
- export function formatPsqlTime(psqlTime: string): string | null {
41
- if (!psqlTime || psqlTime.trim() === "") {
42
- return null;
43
- }
44
-
45
- try {
46
- const hours = psqlTime.substring(0, 2);
47
- const minutes = psqlTime.substring(2, 4);
48
- return `${hours}:${minutes}:00`;
49
- } catch (error) {
50
- return null;
51
- }
52
- }
53
-
54
- /**
55
- * Combines PSQL date and time into ISO datetime string
56
- * @param psqlDate Date in YYMMDD format
57
- * @param psqlTime Time in HHMM format
58
- * @returns ISO datetime string or null if invalid
59
- */
60
- export function combinePsqlDateTime(
61
- psqlDate: string,
62
- psqlTime: string
63
- ): string | null {
64
- const date = formatPsqlDate(psqlDate);
65
- const time = formatPsqlTime(psqlTime);
66
-
67
- if (!date || !time) {
68
- return null;
69
- }
70
-
71
- return `${date}T${time}`;
72
- }
73
-
74
- /**
75
- * Helper to check if a PSQL date is "empty" (000000 or blank)
76
- */
77
- export function isPsqlDateEmpty(psqlDate: string): boolean {
78
- return !psqlDate || psqlDate === "000000" || psqlDate.trim() === "";
79
- }
80
-
81
- /**
82
- * Clean and trim PSQL CHAR field (removes trailing spaces)
83
- * PSQL CHAR fields are fixed-width and padded with spaces
84
- */
85
- export function cleanPsqlCharField(value: string | null | undefined): string {
86
- if (value === null || value === undefined) {
87
- return "";
88
- }
89
- return String(value).trim();
90
- }
@@ -1,178 +0,0 @@
1
- import odbc from "odbc";
2
- import { PsqlConfiguration } from "./configuration";
3
- import { ERPResponse } from "../../types/erp-types";
4
- import { OdbcErrorResponse } from "./internal/types/psql-types";
5
- import logger from "../reporting-service/logger";
6
-
7
- type PagingParams = {
8
- limit?: number;
9
- offset?: number;
10
- };
11
-
12
- export class PsqlService {
13
- private config: PsqlConfiguration;
14
-
15
- constructor(config: PsqlConfiguration) {
16
- this.config = config;
17
- }
18
-
19
- // REMOVED: dispose() method - not needed anymore
20
- // REMOVED: connection property - not needed anymore
21
- // REMOVED: openConnection() method - not needed anymore
22
- // REMOVED: closeConnection() method - not needed anymore
23
-
24
- /**
25
- * Build PSQL ODBC connection string
26
- * CRITICAL: ServerName must use IP.PORT format (e.g., 10.4.0.11.1583)
27
- */
28
- private buildConnectionString(): string {
29
- const serverName = `${this.config.host}.${this.config.port}`;
30
-
31
- return (
32
- [
33
- "Driver={Pervasive ODBC Interface}",
34
- `ServerName=${serverName}`,
35
- `DBQ=${this.config.database}`,
36
- `UID=${this.config.username}`,
37
- `PWD=${this.config.password}`,
38
- "AutoDoubleQuote=0",
39
- ].join(";") + ";"
40
- );
41
- }
42
-
43
- /**
44
- * Execute a query and return the results
45
- * Creates a fresh connection for each query to avoid handle corruption
46
- *
47
- * @param query The SQL query to execute
48
- * @param params Query parameters (currently unused for PSQL read operations)
49
- * @param paging Optional paging parameters
50
- * @returns The entities fetched from the database, along with paging information
51
- */
52
- public async executePreparedStatement(
53
- query: string,
54
- params: Record<string, string> = {},
55
- paging?: PagingParams
56
- ): Promise<ERPResponse | undefined> {
57
- let connection: odbc.Connection | null = null;
58
-
59
- try {
60
- // Create fresh connection for THIS query only
61
- const connStr = this.buildConnectionString();
62
- logger.debug("Creating fresh PSQL connection for query");
63
- connection = await odbc.connect(connStr);
64
-
65
- if (Object.keys(params).length > 0) {
66
- logger.warn(
67
- "PsqlService: Query parameters provided but parameter binding not yet implemented. " +
68
- "Using direct query execution. This is acceptable for Phase 1 read operations."
69
- );
70
- }
71
-
72
- const records = await connection.query(query);
73
- const allRecords = PsqlService.recordsetToRecords(records);
74
- const rowsFetched = allRecords.length;
75
-
76
- // Apply paging if requested
77
- const pagedData =
78
- paging?.offset !== undefined || paging?.limit !== undefined
79
- ? allRecords.slice(
80
- paging.offset || 0,
81
- (paging.offset || 0) + (paging.limit || allRecords.length)
82
- )
83
- : allRecords;
84
-
85
- return {
86
- data: pagedData,
87
- paging: {
88
- count: rowsFetched,
89
- limit: paging?.limit || 0,
90
- offset: paging?.offset || 0,
91
- nextPage:
92
- paging?.limit && (paging.offset || 0) + paging.limit < rowsFetched
93
- ? String((paging.offset || 0) + paging.limit)
94
- : undefined,
95
- previousPage: paging?.offset
96
- ? String(Math.max(0, (paging.offset || 0) - (paging.limit || 10)))
97
- : undefined,
98
- },
99
- };
100
- } catch (error) {
101
- const errorInfo = error as OdbcErrorResponse;
102
- logger.error("Error fetching data from PSQL", {
103
- error: errorInfo.message,
104
- odbcErrors: errorInfo.odbcErrors,
105
- query: query.substring(0, 200), // Log first 200 chars of query
106
- });
107
-
108
- throw this.handleOdbcError(errorInfo);
109
- } finally {
110
- // CRITICAL: Always close connection, even on error
111
- if (connection) {
112
- try {
113
- await connection.close();
114
- logger.debug("PSQL connection closed successfully");
115
- } catch (err) {
116
- // Don't throw on close errors, just log
117
- logger.warn("Error closing PSQL connection (non-fatal)", {
118
- error: err,
119
- });
120
- }
121
- }
122
- }
123
- }
124
-
125
- /**
126
- * Transform ODBC result set to array of Record<string, string> instances.
127
- * IMPORTANT: PSQL CHAR fields are often padded with spaces - we trim them
128
- */
129
- public static recordsetToRecords(recordset: any[]): Record<string, string>[] {
130
- if (!Array.isArray(recordset)) {
131
- return [];
132
- }
133
-
134
- const data: Record<string, string>[] = recordset.map((row) => {
135
- const transformedRow: Record<string, string> = {};
136
- Object.keys(row).forEach((key) => {
137
- const value = row[key];
138
- transformedRow[key] =
139
- value !== null && value !== undefined ? String(value).trim() : "";
140
- });
141
- return transformedRow;
142
- });
143
-
144
- return data;
145
- }
146
-
147
- /**
148
- * Handle ODBC errors and provide meaningful messages
149
- */
150
- private handleOdbcError(error: OdbcErrorResponse): Error {
151
- const odbcError = error.odbcErrors?.[0];
152
- const errorCode = odbcError?.state;
153
- const message = odbcError?.message || error.message;
154
-
155
- switch (errorCode) {
156
- case "08S01":
157
- return new Error(
158
- "PSQL connection failed. Check: " +
159
- "1) PVSW environment variable set to /usr/local/psql/etc/pvsw.ini, " +
160
- "2) Network connectivity to ports 1583/3351, " +
161
- "3) ODBC configuration files in /usr/local/psql/etc/ and /etc/. " +
162
- `Original error: ${message}`
163
- );
164
- case "28000":
165
- return new Error(
166
- `PSQL authentication failed. Check username/password. Original error: ${message}`
167
- );
168
- case "42000":
169
- return new Error(`PSQL SQL syntax error. Original error: ${message}`);
170
- case "42S02":
171
- return new Error(
172
- `PSQL table or view not found. Check table names in query. Original error: ${message}`
173
- );
174
- default:
175
- return new Error(`PSQL error (${errorCode || "unknown"}): ${message}`);
176
- }
177
- }
178
- }