Add settled_by_admin field in order.ts model and improve getDetailedOrder output.

bot/commands.ts

@@ -598,13 +598,8 @@ const addInvoicePHI = async (
     ctx.deleteMessage();
     const order = await Order.findOne({ _id: orderId });
     if (order === null) throw new Error('order was not found');
-    // orders with status PAID_HOLD_INVOICE or COMPLETED_BY_ADMIN are released payments
-    if (
-      order.status !== 'PAID_HOLD_INVOICE' &&
-      order.status !== 'COMPLETED_BY_ADMIN'
-    ) {
-      return;
-    }
+    // only orders with status PAID_HOLD_INVOICE are released payments
+    if (order.status !== 'PAID_HOLD_INVOICE') return;
 
     const buyer = await User.findOne({ _id: order.buyer_id });
     if (buyer === null) return;

bot/modules/block/commands.ts

@@ -23,7 +23,6 @@ const block = async (ctx: MainContext, username: string): Promise<void> => {
         'CLOSED',
         'CANCELED_BY_ADMIN',
         'EXPIRED',
-        'COMPLETED_BY_ADMIN',
         'SUCCESS',
         'PAID_HOLD_INVOICE',
         'CANCELED',

bot/start.ts

@@ -133,16 +133,10 @@ const askForConfirmation = async (user: UserDocument, command: string) => {
       orders = await Order.find(where);
     } else if (command === '/setinvoice') {
       const where: FilterQuery<OrderQuery> = {
-        $and: [
-          { buyer_id: user._id },
-          {
-            $or: [
-              { status: 'PAID_HOLD_INVOICE' },
-              { status: 'COMPLETED_BY_ADMIN' },
-            ],
-          },
-        ],
+        buyer_id: user._id,
+        status: 'PAID_HOLD_INVOICE',
       };
+
       orders = await Order.find(where);
     }
 
@@ -550,15 +544,17 @@ const initialize = (
         }
       }
 
-      if (order.secret) await settleHoldInvoice({ secret: order.secret });
+      if (order.secret) {
+        await settleHoldInvoice({ secret: order.secret });
+        order.settled_by_admin = true;
+        await order.save();
+      }
 
       if (dispute) {
         dispute.status = 'SETTLED';
         await dispute.save();
       }
 
-      order.status = 'COMPLETED_BY_ADMIN';
-      await order.save();
       const buyer = await User.findOne({ _id: order.buyer_id });
       const seller = await User.findOne({ _id: order.seller_id });
       if (buyer === null || seller === null)

locales/de.yaml

@@ -178,6 +178,8 @@ order_detail: |
 
   Status: ${status}
 
+  Von Admin abgeschlossen: ${settledByAdmin}
+
   Ersteller: @${creator || ''}
 
   Käufer: @${buyerUsername || ''}

locales/en.yaml

@@ -182,6 +182,8 @@ order_detail: |
 
   Status: ${status}
 
+  Settled by admin: ${settledByAdmin}
+
   Creator: @${creator || ''}
 
   Buyer: @${buyerUsername || ''}

locales/es.yaml

@@ -178,6 +178,8 @@ order_detail: |
 
   Status: ${status}
 
+  Completada por admin: ${settledByAdmin}
+
   Creador: @${creator || ''}
 
   Comprador: @${buyerUsername || ''}

locales/fa.yaml

@@ -186,6 +186,8 @@ order_detail: |
 
   وضعیت: ${status}
 
+  تسویه توسط مدیر: ${settledByAdmin}
+
   ایجاد کننده: @${creator || ''}
 
   خریدار: @${buyerUsername || ''}

locales/fr.yaml

@@ -180,6 +180,8 @@ order_detail: |
 
   Statut : ${status}
 
+  Complété par l'administrateur : ${settledByAdmin}
+
   Créateur : @${creator || ''}
 
   Acheteur : @${buyerUsername || ''}

locales/it.yaml

@@ -178,6 +178,8 @@ order_detail: |
 
   Stato: ${status}
 
+  Completato dall'amministratore: ${settledByAdmin}
+
   Creato da: @${creator || ''}
 
   Acquirente: @${buyerUsername || ''}

locales/ko.yaml

@@ -179,6 +179,8 @@ order_detail: |
 
   상태: ${status}
 
+  관리자에 의해 완료됨: ${settledByAdmin}
+
   생성자: @${creator || ''}
 
   구매자: @${buyerUsername || ''}

locales/pt.yaml

@@ -179,6 +179,8 @@ order_detail: |
 
   Status: ${status}
 
+  Completado por admin: ${settledByAdmin}
+
   Criadora: @${creator || ''}
 
   Compradora: @${buyerUsername || ''}

locales/ru.yaml

@@ -177,6 +177,8 @@ order_detail: |
 
   Статус: ${status}
 
+  Завершено администратором: ${settledByAdmin}
+
   Создатель: @${creator || ''}
 
   Покупатель: @${buyerUsername || ''}

locales/uk.yaml

@@ -177,6 +177,8 @@ order_detail: |
 
   Статус: ${status}
 
+  Завершено адміністратором: ${settledByAdmin}
+
   Автор: @${creator || ''}
 
   Покупець: @${buyerUsername || ''}

models/order.ts

@@ -47,6 +47,7 @@ export interface IOrder extends Document {
   is_public: boolean;
   random_image: string;
   is_golden_honey_badger?: boolean;
+  settled_by_admin?: boolean;
 }
 
 const orderSchema = new Schema<IOrder, mongoose.Model<IOrder>>({
@@ -118,10 +119,10 @@ const orderSchema = new Schema<IOrder, mongoose.Model<IOrder>>({
       'PAID_HOLD_INVOICE', // seller released funds
       'CANCELED_BY_ADMIN',
       'EXPIRED', // Expired orders, stated changed by a job
-      'COMPLETED_BY_ADMIN',
       'FROZEN',
     ],
   },
+  settled_by_admin: { type: Boolean, default: false },
   type: { type: String },
   fiat_amount: { type: Number, min: 1 }, // amount in fiat
   fiat_code: { type: String },

scripts/migrate_completed_by_admin_orders.ts

@@ -0,0 +1,39 @@
+import 'dotenv/config';
+import { connect as mongoConnect } from '../db_connect';
+import Order from '../models/order';
+import { logger } from '../logger';
+
+const migrate = async () => {
+  try {
+    const mongoose = mongoConnect();
+    await new Promise((resolve, reject) => {
+      mongoose.connection.once('open', resolve);
+      mongoose.connection.on('error', reject);
+    });
+
+    logger.info('Connected to MongoDB for migration.');
+
+    const query = { status: 'COMPLETED_BY_ADMIN' };
+    const update = {
+      $set: {
+        status: 'SUCCESS',
+        settled_by_admin: true,
+      },
+    };
+
+    const result = await Order.updateMany(query, update);
+
+    logger.info(`Migration completed.`);
+    logger.info(`Matched: ${result.matchedCount} orders.`);
+    logger.info(`Modified: ${result.modifiedCount} orders.`);
+
+    await mongoose.connection.close();
+    logger.info('Database connection closed.');
+    process.exit(0);
+  } catch (error) {
+    logger.error(`Migration failed: ${error}`);
+    process.exit(1);
+  }
+};
+
+migrate();

tests/bot/bot.spec.ts

@@ -609,4 +609,110 @@ describe('Bot Initialization', () => {
       ctx.reply.calledWithExactly('This is an unknown command.'),
     ).to.be.equal(true);
   });
+
+  it('should set settled_by_admin when admin settles with secret', async () => {
+    const orderMock = {
+      _id: 'orderId',
+      status: 'DISPUTE',
+      secret: 'secret',
+      community_id: null,
+      buyer_id: 'buyer',
+      seller_id: 'seller',
+      save: sinon.stub().resolves(),
+    } as any;
+
+    const OrderFindOneStub = sinon.stub().resolves(orderMock);
+    const settleHoldInvoiceStub = sinon.stub().resolves();
+
+    const startModule = proxyquire('../../bot/start', {
+      telegraf: { Telegraf: sinon.stub().returns(botStub) },
+      '../models': {
+        Order: { findOne: OrderFindOneStub },
+        User: { findOne: sinon.stub().resolves({ id: 'user' }) },
+        Dispute: { findOne: sinon.stub().resolves(null) },
+      },
+      './validations': {
+        validateParams: sinon.stub().resolves(['orderId']),
+        validateObjectId: sinon.stub().resolves(true),
+      },
+      '../ln': { settleHoldInvoice: settleHoldInvoiceStub },
+      './messages': {
+        successCompleteOrderMessage: sinon.stub().resolves(),
+        successCompleteOrderByAdminMessage: sinon.stub().resolves(),
+      },
+    });
+
+    startModule.initialize('dummy-token', {});
+    const settleOrderCall = botStub.command
+      .getCalls()
+      .find((c: any) => c.args[0] === 'settleorder');
+    const handler = settleOrderCall.args[2];
+
+    const ctx = {
+      admin: { admin: true },
+      match: ['/settleorder orderId', 'orderId'],
+      reply: sinon.stub().resolves(),
+      i18n: { t: sinon.stub().returns('Success') },
+      telegram: { sendMessage: sinon.stub().resolves() },
+    };
+
+    await handler(ctx);
+
+    expect(settleHoldInvoiceStub.calledWith({ secret: 'secret' })).to.be.equal(
+      true,
+    );
+    expect(orderMock.settled_by_admin).to.be.equal(true);
+    expect(orderMock.save.called).to.be.equal(true);
+  });
+
+  it('should not modify order if settleHoldInvoice fails', async () => {
+    const orderMock = {
+      _id: 'orderId',
+      status: 'DISPUTE',
+      secret: 'invalidsecret',
+      community_id: null,
+      buyer_id: 'buyer',
+      seller_id: 'seller',
+      save: sinon.stub().resolves(),
+    } as any;
+
+    const OrderFindOneStub = sinon.stub().resolves(orderMock);
+    const settleHoldInvoiceStub = sinon.stub().rejects(new Error('LND failed'));
+
+    const startModule = proxyquire('../../bot/start', {
+      telegraf: { Telegraf: sinon.stub().returns(botStub) },
+      '../models': {
+        Order: { findOne: OrderFindOneStub },
+        User: { findOne: sinon.stub().resolves({ id: 'user' }) },
+        Dispute: { findOne: sinon.stub().resolves(null) },
+      },
+      './validations': {
+        validateParams: sinon.stub().resolves(['orderId']),
+        validateObjectId: sinon.stub().resolves(true),
+      },
+      '../ln': { settleHoldInvoice: settleHoldInvoiceStub },
+      './messages': {
+        successCompleteOrderMessage: sinon.stub().resolves(),
+        successCompleteOrderByAdminMessage: sinon.stub().resolves(),
+      },
+    });
+
+    startModule.initialize('dummy-token', {});
+    const settleOrderCall = botStub.command
+      .getCalls()
+      .find((c: any) => c.args[0] === 'settleorder');
+    const handler = settleOrderCall.args[2];
+
+    const ctx = {
+      admin: { admin: true },
+      match: ['/settleorder orderId', 'orderId'],
+      reply: sinon.stub().resolves(),
+      i18n: { t: sinon.stub().returns('Success') },
+    };
+
+    await handler(ctx);
+
+    expect(orderMock.save.called).to.be.equal(false);
+    expect(orderMock.settled_by_admin).to.equal(undefined);
+  });
 });