Parcourir la source

Fixes for renamed path.

FAMBL il y a 1 an
Parent
commit
fb466c6cb5

+ 7 - 7
package-lock.json

@@ -14,7 +14,7 @@
         "jsonschema": "^1.4.1",
         "mongoose": "^6.9.0",
         "rfdc": "^1.3.0",
-        "rxjs": "^7.8.0",
+        "rxjs": "^7.8.1",
         "typescript": "^4.9.4",
         "uuid": "^9.0.0"
       }
@@ -1346,9 +1346,9 @@
       "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
     },
     "node_modules/rxjs": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz",
-      "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==",
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dependencies": {
         "tslib": "^2.1.0"
       }
@@ -2543,9 +2543,9 @@
       "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
     },
     "rxjs": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz",
-      "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==",
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "requires": {
         "tslib": "^2.1.0"
       }

+ 1 - 1
package.json

@@ -28,7 +28,7 @@
     "jsonschema": "^1.4.1",
     "mongoose": "^6.9.0",
     "rfdc": "^1.3.0",
-    "rxjs": "^7.8.0",
+    "rxjs": "^7.8.1",
     "typescript": "^4.9.4",
     "uuid": "^9.0.0"
   }

+ 2 - 2
services/acknowledgement.service.ts

@@ -2,8 +2,8 @@ import { AnyObject } from "mongoose";
 import { map, Observable, of, tap } from "rxjs";
 import { BaseMessage, Command, ResponseMessage, Uuid } from "../dependencies/fisappmessagejsutilty/interface/export"
 import { FisCreateMessageUtility } from "../dependencies/fisappmessagejsutilty/interface/export";
-import { LoggingService } from "../dependencies/fisloggingservice/services/logging-service";
-import { LogSetting, MessageLog } from "../dependencies/fisloggingservice/type/datatype";
+import { LoggingService } from "../dependencies/log/services/logging-service";
+import { LogSetting, MessageLog } from "../dependencies/log/type/datatype";
 import { Acknowledgemeent, AcknowledgementLogSetting } from "../type/acknowledgement.interface";
 
 

+ 2 - 2
services/incomingMessage.service.ts

@@ -1,7 +1,7 @@
 import { map, Observable, of, tap } from "rxjs";
 import { BaseMessage, Command, ResponseMessage, Uuid } from "../dependencies/fisappmessagejsutilty/interface/export"
-import { LoggingService } from "../dependencies/fisloggingservice/services/logging-service";
-import { LogSetting, MessageLog } from "../dependencies/fisloggingservice/type/datatype";
+import { LoggingService } from "../dependencies/log/services/logging-service";
+import { LogSetting, MessageLog } from "../dependencies/log/type/datatype";
 import { IncomingMessageServiceInterface } from "../type/datatype";
 
 /**

+ 2 - 2
services/message-auditor.service.ts

@@ -1,7 +1,7 @@
 import { map, Observable, of, Subject } from "rxjs";
 import { BaseMessage } from "../dependencies/fisappmessagejsutilty/dependencies/dependencies";
-import { LoggingService } from "../dependencies/fisloggingservice/services/logging-service";
-import { LogSetting, MessageLog } from "../dependencies/fisloggingservice/type/datatype";
+import { LoggingService } from "../dependencies/log/services/logging-service";
+import { LogSetting, MessageLog } from "../dependencies/log/type/datatype";
 import { ErrorTrigger, MessageAuditorServiceInterface, MessageSynchronisationServiceSetting } from "../type/datatype";
 
 export class MessageAuditorService implements MessageAuditorServiceInterface {

+ 1 - 1
test/test-streamOBS.ts

@@ -3,7 +3,7 @@
 
 import { from, map, Observable, of, Subject } from "rxjs";
 import * as fs from "fs"
-import { BaseMessage } from "../dependencies/fisloggingservice/services/logging-service";
+import { BaseMessage } from "../dependencies/log/services/logging-service";
 
 export class StreamingService {
     private messagesJSON: any = fs.readFileSync("testRequest.json")

+ 1 - 1
test/test1a.ts

@@ -3,7 +3,7 @@ import { StreamingService } from "./test-streamOBS";
 import { MessageAuditorService } from "../services/message-auditor.service";
 import { IncomingMessageService } from "../services/incomingMessage.service";
 import { map, Observable } from "rxjs";
-import { LogSetting, MessageLog } from "../dependencies/fisloggingservice/type/datatype";
+import { LogSetting, MessageLog } from "../dependencies/log/type/datatype";
 import { BaseMessage } from "../dependencies/fisappmessagejsutilty/dependencies/dependencies";
 const incoming = new IncomingMessageService()
 const acknowledge = new AcknowledgementService()

+ 1 - 1
test/test1b.ts

@@ -3,7 +3,7 @@ import { StreamingService } from "./test-streamOBS";
 import { MessageAuditorService } from "../services/message-auditor.service";
 import { IncomingMessageService } from "../services/incomingMessage.service";
 import { map, Observable } from "rxjs";
-import { LogSetting, MessageLog } from "../dependencies/fisloggingservice/type/datatype";
+import { LogSetting, MessageLog } from "../dependencies/log/type/datatype";
 import { BaseMessage } from "../dependencies/fisappmessagejsutilty/dependencies/dependencies";
 const incoming = new IncomingMessageService()
 const acknowledge = new AcknowledgementService()

+ 1 - 1
test/test2a.ts

@@ -3,7 +3,7 @@ import { StreamingService } from "./test-streamOBS";
 import { MessageAuditorService } from "../services/message-auditor.service";
 import { IncomingMessageService } from "../services/incomingMessage.service";
 import { map, Observable, take } from "rxjs";
-import { LogSetting, MessageLog } from "../dependencies/fisloggingservice/type/datatype";
+import { LogSetting, MessageLog } from "../dependencies/log/type/datatype";
 import { BaseMessage } from "../dependencies/fisappmessagejsutilty/dependencies/dependencies";
 const incoming = new IncomingMessageService()
 const syncrhonize = new MessageAuditorService()

+ 1 - 1
test/test2b.ts

@@ -3,7 +3,7 @@ import { StreamingService } from "./test-streamOBS";
 import { MessageAuditorService } from "../services/message-auditor.service";
 import { IncomingMessageService } from "../services/incomingMessage.service";
 import { map, Observable, take } from "rxjs";
-import { LogSetting, MessageLog } from "../dependencies/fisloggingservice/type/datatype";
+import { LogSetting, MessageLog } from "../dependencies/log/type/datatype";
 import { BaseMessage } from "../dependencies/fisappmessagejsutilty/dependencies/dependencies";
 const incoming = new IncomingMessageService()
 const syncrhonize = new MessageAuditorService()

+ 1 - 1
test/test3a.ts

@@ -5,7 +5,7 @@ server data, and then synchronizing them */
 
 import { Observable, map, Subject, takeUntil, take, of, timer, from } from "rxjs";
 import { BaseMessage } from "../dependencies/fisappmessagejsutilty/dependencies/dependencies";
-import { LogSetting, MessageLog } from "../dependencies/fisloggingservice/type/datatype";
+import { LogSetting, MessageLog } from "../dependencies/log/type/datatype";
 import { IncomingMessageService } from "../services/incomingMessage.service";
 import { MessageAuditorService } from "../services/message-auditor.service";
 import { ErrorTrigger, MessageSynchronisationServiceSetting } from "../type/datatype";

+ 1 - 1
test/test3b.ts

@@ -5,7 +5,7 @@ server data, and then synchronizing them */
 
 import { Observable, map, Subject, takeUntil, take, of, timer, from } from "rxjs";
 import { BaseMessage } from "../dependencies/fisappmessagejsutilty/dependencies/dependencies";
-import { LogSetting, MessageLog } from "../dependencies/fisloggingservice/type/datatype";
+import { LogSetting, MessageLog } from "../dependencies/log/type/datatype";
 import { AcknowledgementService } from "../services/acknowledgement.service";
 import { IncomingMessageService } from "../services/incomingMessage.service";
 import { MessageAuditorService } from "../services/message-auditor.service";

+ 2 - 2
test/test3c.ts

@@ -5,11 +5,11 @@ server data, and then synchronizing them */
 
 import { Observable, map, Subject, takeUntil, take, of, timer, from } from "rxjs";
 import { BaseMessage, ResponseMessage } from "../dependencies/fisappmessagejsutilty/dependencies/dependencies";
-import { LogSetting, MessageLog } from "../dependencies/fisloggingservice/type/datatype";
+import { LogSetting, MessageLog } from "../dependencies/log/type/datatype";
 import { ErrorTrigger, MessageSynchronisationServiceSetting } from "../type/datatype";
 import { StreamingService } from "./test-streamOBS";
 import { MessageAuditorService } from "../services/message-auditor.service";
-import { LoggingService } from "../dependencies/fisloggingservice/services/logging-service";
+import { LoggingService } from "../dependencies/log/services/logging-service";
 
 /* Pre - Defined Data && Settings */
 // This service will stream the messages from the local testRequest.json messages

+ 2 - 2
type/acknowledgement.interface.ts

@@ -1,7 +1,7 @@
 import { Observable } from "rxjs";
 import { ResponseMessage } from "../dependencies/fisappmessagejsutilty/dependencies/dependencies";
-import { BaseMessage } from "../dependencies/fisloggingservice/services/logging-service";
-import { LogSetting } from "../dependencies/fisloggingservice/type/datatype";
+import { BaseMessage } from "../dependencies/log/services/logging-service";
+import { LogSetting } from "../dependencies/log/type/datatype";
 
 /**
  * @deprecated The acknowledgement will be covered by MessageAuditorService.

+ 5 - 2
type/datatype.ts

@@ -1,6 +1,6 @@
 import { Observable } from "rxjs";
 import { BaseMessage } from "../dependencies/fisappmessagejsutilty/dependencies/dependencies";
-import { LogSetting, MessageLog } from "../dependencies/fisloggingservice/type/datatype";
+import { LogSetting, MessageLog } from "../dependencies/log/type/datatype";
 
 type IncomingMessageSetting = LogSetting & {
     incomingObservable: Observable<BaseMessage>
@@ -20,10 +20,13 @@ export interface MessageSynchronisationServiceSetting {
 }
 
 // Renew Structure To fix undefined issue at test3a.ts init()
-type LogSettingwTags = LogSetting & Tags
+type LogSettingwTags = LogSetting & Tags & Filtes
 interface Tags {
     tags: string[]
 }
+interface Filtes {
+    filters?: string[]
+}
 // Acknowledgement Service Class
 export interface MessageAuditorServiceInterface {
     // Set default setting