Merge pull request #195 from docknetwork/chore/update-transaction-management

update transaction management

Author: maycon-mello

packages/data-store/src/entities/document/create-document.ts

@@ -1,9 +1,9 @@
-import { ContextProps, WalletDocument } from '../../types';
-import { v4 as uuid } from 'uuid';
-import { DocumentEntity } from './document.entity';
-import { getOrCreateDocumentTypes, saveOptions } from './helpers';
-import { getDocumentById } from './get-document-by-id';
-import { logger } from '../../logger';
+import {ContextProps, WalletDocument} from '../../types';
+import {v4 as uuid} from 'uuid';
+import {DocumentEntity} from './document.entity';
+import {getOrCreateDocumentTypes, saveOptions} from './helpers';
+import {getDocumentById} from './get-document-by-id';
+import {logger} from '../../logger';
 
 /**
  * Create document
@@ -18,57 +18,55 @@ export async function createDocument({
 }): Promise<WalletDocument> {
   logger.debug(`Creating document with id ${json.id}...`);
 
-  return dataStore.db.transaction(async transactionalEntityManager => {
-    if (json.id) {
-      const existingDocument = await getDocumentById({
-        dataStore,
-        id: json.id,
-      });
-
-      if (existingDocument) {
-        logger.debug(`Document with id ${json.id} already exists`);
-        throw new Error(`Document with id ${json.id} already exists`);
-      }
-    }
-
-    const _typeRel = await getOrCreateDocumentTypes({
+  if (json.id) {
+    const existingDocument = await getDocumentById({
       dataStore,
-      types: json.type,
+      id: json.id,
     });
 
-    if (!json.id) {
-      json.id = uuid();
+    if (existingDocument) {
+      logger.debug(`Document with id ${json.id} already exists`);
+      throw new Error(`Document with id ${json.id} already exists`);
     }
+  }
 
-    let networkId;
+  const _typeRel = await getOrCreateDocumentTypes({
+    dataStore,
+    types: json.type,
+  });
 
-    if (json._networkId) {
-      networkId = json._networkId;
-      delete json._networkId;
-    } else {
-      const resolution = await dataStore.resolveDocumentNetwork({
-        document: json,
-        dataStore,
-      });
+  if (!json.id) {
+    json.id = uuid();
+  }
 
-      networkId = resolution.networkId;
-    }
+  let networkId;
 
-    const entity: DocumentEntity = {
-      networkId,
-      id: json.id,
-      type: json.type,
-      _typeRel,
-      correlation: json.correlation || [],
-      data: JSON.stringify(json),
-    };
+  if (json._networkId) {
+    networkId = json._networkId;
+    delete json._networkId;
+  } else {
+    const resolution = await dataStore.resolveDocumentNetwork({
+      document: json,
+      dataStore,
+    });
 
-    const repository = transactionalEntityManager.getRepository(DocumentEntity);
+    networkId = resolution.networkId;
+  }
 
-    const result = await repository.save(entity, saveOptions);
+  const entity: DocumentEntity = {
+    networkId,
+    id: json.id,
+    type: json.type,
+    _typeRel,
+    correlation: json.correlation || [],
+    data: JSON.stringify(json),
+  };
 
-    logger.debug(`Document added to the wallet`);
+  const repository = dataStore.db.getRepository(DocumentEntity);
 
-    return result;
-  });
+  const result = await repository.save(entity, saveOptions);
+
+  logger.debug(`Document added to the wallet`);
+
+  return result;
 }

packages/data-store/src/entities/document/update-document.ts

@@ -12,16 +12,14 @@ export async function updateDocument({
   dataStore,
   document,
 }: ContextProps & {document: WalletDocument}): Promise<WalletDocument> {
-  return dataStore.db.transaction(async transactionalEntityManager => {
-    logger.debug(`Updating document with id ${document.id}`);
+  logger.debug(`Updating document with id ${document.id}`);
 
-    const repository = transactionalEntityManager.getRepository(DocumentEntity);
-    const entity = await toDocumentEntity({
-      dataStore,
-      document,
-    });
-    await repository.save(entity, saveOptions);
-
-    return document;
+  const repository = dataStore.db.getRepository(DocumentEntity);
+  const entity = await toDocumentEntity({
+    dataStore,
+    document,
   });
+  await repository.save(entity, saveOptions);
+
+  return document;
 }