Reverted a few from app/api/src/transactions

Signed-off-by: Eric Le Ponner <eric.leponner@icloud.com>

Author: ericleponner

back-end/apps/api/src/transactions/approvers/approvers.service.ts

@@ -64,10 +64,10 @@ export class ApproversService {
   ) {}
 
   /* Get the approver by id */
-  async getTransactionApproverById(
+  getTransactionApproverById(
     id: number,
     entityManager?: EntityManager,
-  ): Promise<TransactionApprover | null> {
+  ): Promise<TransactionApprover> {
     if (!id) return null;
 
     const find: FindOneOptions<TransactionApprover> = {
@@ -90,7 +90,7 @@ export class ApproversService {
     userId?: number,
     entityManager?: EntityManager,
   ): Promise<TransactionApprover[]> {
-    if (typeof transactionId !== 'number' || (userId && typeof userId !== 'number')) return [];
+    if (typeof transactionId !== 'number' || (userId && typeof userId !== 'number')) return null;
 
     return (entityManager || this.repo).query(
       `
@@ -145,8 +145,8 @@ export class ApproversService {
     if (
       userKeysToSign.length === 0 &&
       transaction.creatorKey?.userId !== user.id &&
-      !(transaction.observers && transaction.observers.some(o => o.userId === user.id)) &&
-      !(transaction.signers && transaction.signers.some(s => s.userKey?.userId === user.id)) &&
+      !transaction.observers.some(o => o.userId === user.id) &&
+      !transaction.signers.some(s => s.userKey?.userId === user.id) &&
       !approvers.some(a => a.userId === user.id)
     )
       throw new UnauthorizedException("You don't have permission to view this transaction");
@@ -206,7 +206,7 @@ export class ApproversService {
 
   /* Soft deletes approvers' tree */
   async removeNode(listId: number): Promise<void> {
-    if (!listId || typeof listId !== 'number') return;
+    if (!listId || typeof listId !== 'number') return null;
 
     await this.repo.query(
       `
@@ -291,7 +291,7 @@ export class ApproversService {
           if (
             dtoApprover.approvers &&
             dtoApprover.approvers.length > 0 &&
-            (dtoApprover.threshold === undefined || isNaN(dtoApprover.threshold))
+            (dtoApprover.threshold === null || isNaN(dtoApprover.threshold))
           )
             throw new Error(this.THRESHOLD_REQUIRED);
 
@@ -305,17 +305,16 @@ export class ApproversService {
           /* Check if the approver threshold is less or equal to the number of approvers */
           if (
             dtoApprover.approvers &&
-            dtoApprover.threshold !== undefined &&
             (dtoApprover.threshold > dtoApprover.approvers.length || dtoApprover.threshold === 0)
           )
             throw new Error(this.THRESHOLD_LESS_OR_EQUAL_APPROVERS(dtoApprover.approvers.length));
 
           const data: DeepPartial<TransactionApprover> = {
             transactionId:
-              dtoApprover.listId === undefined || isNaN(dtoApprover.listId) ? transactionId : undefined,
+              dtoApprover.listId === null || isNaN(dtoApprover.listId) ? transactionId : null,
             listId: dtoApprover.listId,
             threshold:
-              dtoApprover.threshold && dtoApprover.approvers ? dtoApprover.threshold : undefined,
+              dtoApprover.threshold && dtoApprover.approvers ? dtoApprover.threshold : null,
             userId: dtoApprover.userId,
           };
 
@@ -346,7 +345,7 @@ export class ApproversService {
               const nestedApprover = { ...nestedDtoApprover, listId: approver.id };
 
               if (!nestedDtoApprover.approvers || nestedDtoApprover.approvers.length === 0) {
-                nestedApprover.threshold = undefined;
+                nestedApprover.threshold = null;
               }
 
               await createApprover({ ...nestedDtoApprover, listId: approver.id });
@@ -429,7 +428,7 @@ export class ApproversService {
               /* Soft delete the parent if there are no more children */
               if (newParentApproversLength === 0) {
                 await transactionalEntityManager.softRemove(TransactionApprover, parent);
-              } else if (parent.threshold != null && newParentApproversLength < parent.threshold) {
+              } else if (newParentApproversLength < parent.threshold) {
                 /* Update the parent threshold if the current one is more than the children */
                 await transactionalEntityManager.update(TransactionApprover, parent.id, {
                   threshold: newParentApproversLength,
@@ -468,10 +467,10 @@ export class ApproversService {
           /* Update the list id and sets the transaction id to null */
           await transactionalEntityManager.update(TransactionApprover, approver.id, {
             listId: dto.listId,
-            transactionId: undefined,
+            transactionId: null,
           });
           approver.listId = dto.listId;
-          approver.transactionId = undefined;
+          approver.transactionId = null;
           updated = true;
 
           return approver;
@@ -552,8 +551,7 @@ export class ApproversService {
 
     const result = await this.removeNode(approver.id);
 
-    const dtos = approver.transactionId !== undefined ? [{ entityId: approver.transactionId }] : []
-    await emitTransactionStatusUpdate(this.notificationsPublisher, dtos);
+    await emitTransactionStatusUpdate(this.notificationsPublisher, [{ entityId: approver.transactionId }]);
 
     return result;
   }
@@ -584,7 +582,7 @@ export class ApproversService {
     const signatureKey = user.keys.find(key => key.id === dto.userKeyId);
 
     /* Gets the public key that the signature belongs to */
-    const publicKey = signatureKey ? PublicKey.fromString(signatureKey.publicKey) : undefined;
+    const publicKey = PublicKey.fromString(signatureKey?.publicKey);
 
     /* Get the transaction body */
     const transaction = await this.dataSource.manager.findOne(Transaction, {
@@ -606,7 +604,6 @@ export class ApproversService {
 
     /* Verify the signature matches the transaction */
     if (
-      !publicKey ||
       !verifyTransactionBodyWithoutNodeAccountIdSignature(sdkTransaction, dto.signature, publicKey)
     )
       throw new BadRequestException(ErrorCodes.SNMP);
@@ -671,13 +668,13 @@ export class ApproversService {
   ) {
     const find: FindManyOptions<TransactionApprover> = {
       where: {
-        listId: typeof approver.listId === 'number' ? approver.listId : undefined,
-        userId: typeof approver.userId === 'number' ? approver.userId : undefined,
+        listId: typeof approver.listId === 'number' ? approver.listId : null,
+        userId: typeof approver.userId === 'number' ? approver.userId : null,
         threshold:
           typeof approver.threshold === 'number' && approver.threshold !== 0
             ? approver.threshold
-            : undefined,
-        transactionId: typeof approver.listId === 'number' ? undefined : transactionId,
+            : null,
+        transactionId: typeof approver.listId === 'number' ? null : transactionId,
       },
     };
 
@@ -709,9 +706,9 @@ export class ApproversService {
   /* Validates the approver DTO */
   private validateApprover(approver: CreateTransactionApproverDto): void {
     if (
-      (approver.listId === null || !approver.listId || isNaN(approver.listId)) &&
-      (approver.threshold === null || !approver.threshold || isNaN(approver.threshold) || approver.threshold === 0) &&
-      (approver.userId === null || !approver.userId || isNaN(approver.userId)) &&
+      (approver.listId === null || isNaN(approver.listId)) &&
+      (approver.threshold === null || isNaN(approver.threshold) || approver.threshold === 0) &&
+      (approver.userId === null || isNaN(approver.userId)) &&
       (!approver.approvers || approver.approvers.length === 0)
     )
       throw new BadRequestException(this.CANNOT_CREATE_EMPTY_APPROVER);

back-end/apps/api/src/transactions/observers/observers.service.ts

@@ -47,9 +47,8 @@ export class ObserversService {
 
     const observers: TransactionObserver[] = [];
 
-    const allObservers = transaction.observers ?? [];
     for (const userId of dto.userIds) {
-      if (!allObservers.some(o => o.userId === userId)) {
+      if (!transaction.observers.some(o => o.userId === userId)) {
         const observer = this.repo.create({ userId, transactionId, role: Role.FULL });
         observers.push(observer);
       }
@@ -101,18 +100,18 @@ export class ObserversService {
     const approvers = await this.approversService.getApproversByTransactionId(transaction.id);
 
     if ([TransactionStatus.EXECUTED, TransactionStatus.FAILED].includes(transaction.status))
-      return transaction.observers ?? [];
+      return transaction.observers;
 
     if (
       userKeysToSign.length === 0 &&
       transaction.creatorKey?.userId !== user.id &&
-      !transaction.observers?.some(o => o.userId === user.id) &&
-      !transaction.signers?.some(s => s.userKey?.userId === user.id) &&
+      !transaction.observers.some(o => o.userId === user.id) &&
+      !transaction.signers.some(s => s.userKey?.userId === user.id) &&
       !approvers.some(a => a.userId === user.id)
     )
       throw new UnauthorizedException("You don't have permission to view this transaction");
 
-    return transaction.observers ?? [];
+    return transaction.observers;
   }
 
   /* Update a transaction observer with the data provided for the given observer id. */

back-end/apps/api/src/transactions/signers/signers.service.ts

@@ -34,7 +34,7 @@ export class SignersService {
   ) {}
 
   /* Get the signature for the given signature id */
-  async getSignatureById(id: number): Promise<TransactionSigner | null> {
+  getSignatureById(id: number): Promise<TransactionSigner | null> {
     if (!id) {
       return null;
     }
@@ -50,6 +50,8 @@ export class SignersService {
     { limit, offset, page, size }: Pagination,
     withDeleted: boolean = false,
   ): Promise<PaginatedResourceDto<TransactionSigner>> {
+    if (!user) return null;
+
     const [items, totalItems] = await this.repo.findAndCount({
       where: {
         userId: user.id,
@@ -77,10 +79,13 @@ export class SignersService {
   }
 
   /* Get the signatures for the given transaction id */
-  async getSignaturesByTransactionId(
+  getSignaturesByTransactionId(
     transactionId: number,
     withDeleted: boolean = false,
   ): Promise<TransactionSigner[]> {
+    if (!transactionId) {
+      return null;
+    }
     return this.repo.find({
       where: {
         transaction: {
@@ -149,7 +154,7 @@ export class SignersService {
       if (!signersByTransaction.has(signer.transactionId)) {
         signersByTransaction.set(signer.transactionId, new Set());
       }
-      signersByTransaction.get(signer.transactionId)!.add(signer.userKeyId);
+      signersByTransaction.get(signer.transactionId).add(signer.userKeyId);
     }
 
     return { transactionMap, signersByTransaction };

back-end/apps/api/src/transactions/transactions.controller.ts

@@ -1,5 +1,4 @@
 import {
-  BadRequestException,
   Body,
   Controller,
   Get,
@@ -22,7 +21,6 @@ import { TransactionId } from '@hiero-ledger/sdk';
 import * as semver from 'semver';
 
 import {
-  ErrorCodes,
   Filtering,
   FilteringParams,
   OnlyOwnerKey,
@@ -197,9 +195,6 @@ export class TransactionsController {
     @Param('transactionId', ParseIntPipe) transactionId: number,
   ): Promise<number[]> {
     const transaction = await this.transactionsService.getTransactionById(transactionId);
-    if (transaction === null) {
-      throw new BadRequestException(ErrorCodes.TNF);
-    }
     return this.transactionsService.getUserKeysToSign(transaction, user);
   }