use types from lib

Author: slaveeks

package.json

@@ -39,7 +39,7 @@
     "@graphql-tools/schema": "^8.5.1",
     "@graphql-tools/utils": "^8.9.0",
     "@hawk.so/nodejs": "^3.1.1",
-    "@hawk.so/types": "^0.1.31",
+    "@hawk.so/types": "^0.1.33",
     "@n1ru4l/json-patch-plus": "^0.2.0",
     "@types/amqp-connection-manager": "^2.0.4",
     "@types/bson": "^4.0.5",

src/utils/merge.ts

@@ -1,19 +1,7 @@
 import mergeWith from 'lodash.mergewith';
 import cloneDeep from 'lodash.clonedeep';
 import { patch } from '@n1ru4l/json-patch-plus';
-
-type HawkEvent = {
-    payload: {
-        [key: string]: any;
-    };
-}
-
-type HawkEventRepetition = {
-    payload: {
-        [key: string]: any;
-    };
-    delta: string;
-}
+import { GroupedEventDBScheme, RepetitionDBScheme } from '@hawk.so/types';
 
 /**
  * One of the features of the events is that their repetition is the difference
@@ -76,7 +64,7 @@ function stringifyPayloadField(payload: any, field: string) {
  * @param repetition {HawkEventRepetition} - The repetition to process
  * @returns {HawkEvent} Updated event with processed repetition payload
  */
-export function composeFullRepetitionEvent(originalEvent: HawkEvent, repetition: HawkEventRepetition | undefined): HawkEvent {
+export function composeFullRepetitionEvent(originalEvent: GroupedEventDBScheme, repetition: RepetitionDBScheme | undefined): GroupedEventDBScheme {
   /**
    * Make a deep copy of the original event, because we need to avoid mutating the original event
    */

yarn.lock

@@ -458,10 +458,10 @@
   dependencies:
     "@types/mongodb" "^3.5.34"
 
-"@hawk.so/types@^0.1.31":
-  version "0.1.31"
-  resolved "https://registry.yarnpkg.com/@hawk.so/types/-/types-0.1.31.tgz#fba2c3451e927558bfcc3b1d942baaf8e72ad214"
-  integrity sha512-o1LeA3JVIUPRSIZegKwAdl4noQ1KYxwr80eisJMlghP9knu6PbYw20rIMyan5qQ3epOWs8gO1CU3iwHZprFiCg==
+"@hawk.so/types@^0.1.33":
+  version "0.1.33"
+  resolved "https://registry.yarnpkg.com/@hawk.so/types/-/types-0.1.33.tgz#feb077b699b3e0001552588a372e1efe6cd58f40"
+  integrity sha512-q3AdVxzQ8Qk8qyYiAcAacxNZXWTG/oLmVpjQlcLm2Eh5OJgpaZvH8hQCeRQ/ml1cqbYW8gUrRbMMCS2QOcwxEw==
   dependencies:
     "@types/mongodb" "^3.5.34"