fix(bling-callback): end process (clear proceed timer) when new tmp h…

…as more orders only [#57] start doc subscription after document set
ecomplus · Aug 28, 2021 · 22a2835 · 22a2835
1 parent 970e49e
commit 22a2835
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/functions/routes/bling/callback.js b/functions/routes/bling/callback.js
@@ -156,29 +156,34 @@ exports.post = ({ appSdk, admin }, req, res) => {
                         }
                       })
                     }
-                    documentRef.set({ orderNumbers })
 
-                    return new Promise((resolve, reject) => {
-                      const unsubscribe = documentRef.onSnapshot(documentSnapshot => {
-                        if (documentSnapshot && documentSnapshot.exists) {
-                          clearTimeout(proceedTimer)
-                          resolve(null)
-                        }
-                      }, err => {
-                        console.log(`Snapshot watcher error: ${err}`)
-                      })
-
-                      const proceedTimer = setTimeout(() => {
-                        unsubscribe()
-                        documentRef.delete().catch(console.error)
-                        console.log(`> #${storeId} order numbers: ${JSON.stringify(orderNumbers)}`)
-                        updateAppData({ appSdk, storeId }, {
-                          ___importation: {
-                            ...appData.___importation,
-                            order_numbers: orderNumbers
+                    return documentRef.set({ orderNumbers }).then(() => {
+                      return new Promise((resolve, reject) => {
+                        const unsubscribe = documentRef.onSnapshot(newDocumentSnapshot => {
+                          if (
+                            newDocumentSnapshot &&
+                            newDocumentSnapshot.exists &&
+                            newDocumentSnapshot.get('orderNumbers').length > orderNumbers.length
+                          ) {
+                            clearTimeout(proceedTimer)
+                            resolve(null)
                           }
-                        }).then(resolve).catch(reject)
-                      }, 1500)
+                        }, err => {
+                          console.log(`Snapshot watcher error: ${err}`)
+                        })
+
+                        const proceedTimer = setTimeout(() => {
+                          unsubscribe()
+                          documentRef.delete().catch(console.error)
+                          console.log(`> #${storeId} order numbers: ${JSON.stringify(orderNumbers)}`)
+                          updateAppData({ appSdk, storeId }, {
+                            ___importation: {
+                              ...appData.___importation,
+                              order_numbers: orderNumbers
+                            }
+                          }).then(resolve).catch(reject)
+                        }, 1500)
+                      })
                     })
                   })
                 }