Don't return invoices cancelled by user

Author: ekzyis

api/resolvers/wallet.js

@@ -468,6 +468,7 @@ const resolvers = {
             SELECT id FROM "Invoice"
             WHERE "userId" = ${me.id}
             AND "actionState" = 'FAILED'
+            AND "userCancel" = false
             AND "lockedAt" IS NULL
             ORDER BY id DESC
             FOR UPDATE SKIP LOCKED
@@ -517,10 +518,10 @@ const resolvers = {
     },
     createWithdrawl: createWithdrawal,
     sendToLnAddr,
-    cancelInvoice: async (parent, { hash, hmac }, { models, lnd, boss }) => {
+    cancelInvoice: async (parent, { hash, hmac, userCancel }, { models, lnd, boss }) => {
       verifyHmac(hash, hmac)
       await finalizeHodlInvoice({ data: { hash }, lnd, models, boss })
-      return await models.invoice.findFirst({ where: { hash } })
+      return await models.invoice.update({ where: { hash }, data: { userCancel: !!userCancel } })
     },
     dropBolt11: async (parent, { hash }, { me, models, lnd }) => {
       if (!me) {

api/typeDefs/wallet.js

@@ -79,7 +79,7 @@ const typeDefs = `
     createInvoice(amount: Int!): InvoiceOrDirect!
     createWithdrawl(invoice: String!, maxFee: Int!): Withdrawl!
     sendToLnAddr(addr: String!, amount: Int!, maxFee: Int!, comment: String, identifier: Boolean, name: String, email: String): Withdrawl!
-    cancelInvoice(hash: String!, hmac: String!): Invoice!
+    cancelInvoice(hash: String!, hmac: String!, userCancel: Boolean): Invoice!
     dropBolt11(hash: String!): Boolean
     removeWallet(id: ID!): Boolean
     deleteWalletLogs(wallet: String): Boolean

components/use-invoice.js

@@ -36,13 +36,13 @@ export default function useInvoice () {
     return { invoice: data.invoice, check: that(data.invoice) }
   }, [client])
 
-  const cancel = useCallback(async ({ hash, hmac }) => {
+  const cancel = useCallback(async ({ hash, hmac }, { userCancel = false } = {}) => {
     if (!hash || !hmac) {
       throw new Error('missing hash or hmac')
     }
 
     console.log('canceling invoice:', hash)
-    const { data } = await cancelInvoice({ variables: { hash, hmac } })
+    const { data } = await cancelInvoice({ variables: { hash, hmac, userCancel } })
     return data.cancelInvoice
   }, [cancelInvoice])
 

components/use-qr-payment.js

@@ -20,7 +20,7 @@ export default function useQrPayment () {
       let paid
       const cancelAndReject = async (onClose) => {
         if (!paid && cancelOnClose) {
-          const updatedInv = await invoice.cancel(inv)
+          const updatedInv = await invoice.cancel(inv, { userCancel: true })
           reject(new InvoiceCanceledError(updatedInv))
         }
         resolve(inv)

fragments/wallet.js

@@ -225,8 +225,8 @@ export const SET_WALLET_PRIORITY = gql`
 
 export const CANCEL_INVOICE = gql`
   ${INVOICE_FIELDS}
-  mutation cancelInvoice($hash: String!, $hmac: String!) {
-    cancelInvoice(hash: $hash, hmac: $hmac) {
+  mutation cancelInvoice($hash: String!, $hmac: String!, $userCancel: Boolean) {
+    cancelInvoice(hash: $hash, hmac: $hmac, userCancel: $userCancel) {
       ...InvoiceFields
     }
   }

prisma/migrations/20241231223214_invoice_user_cancel/migration.sql

@@ -0,0 +1,27 @@
+-- AlterTable
+ALTER TABLE "Invoice" ADD COLUMN "userCancel" BOOLEAN;
+UPDATE "Invoice" SET "userCancel" = false;
+
+-- make sure there are no invoices that are in an inconsistent cancel state
+-- Add constraint to ensure consistent cancel state
+ALTER TABLE "Invoice" ADD CONSTRAINT "Invoice_cancel" CHECK (
+  ("cancelled" = true AND "cancelledAt" IS NOT NULL AND "userCancel" IS NOT NULL) OR
+  ("cancelled" = false AND "cancelledAt" IS NULL AND "userCancel" IS NULL)
+);
+
+-- Add trigger to set userCancel to false when cancelled updated
+CREATE OR REPLACE FUNCTION invoice_set_user_cancel_default()
+RETURNS TRIGGER AS $$
+BEGIN
+  IF NEW.cancelled AND NEW."userCancel" IS NULL THEN
+    NEW."userCancel" := false;
+  END IF;
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER invoice_user_cancel_trigger
+  BEFORE UPDATE ON "Invoice"
+  FOR EACH ROW
+  EXECUTE FUNCTION invoice_set_user_cancel_default();
+

prisma/schema.prisma

@@ -917,6 +917,7 @@ model Invoice {
   confirmedIndex     BigInt?
   cancelled          Boolean             @default(false)
   cancelledAt        DateTime?
+  userCancel         Boolean?
   lockedAt           DateTime?
   msatsRequested     BigInt
   msatsReceived      BigInt?