From 85ce00f2277b19c2c105d9b84408e1dfde097360 Mon Sep 17 00:00:00 2001
From: Bennie Rosas <ben@aliencyb.org>
Date: Wed, 17 Apr 2024 10:55:20 -0700
Subject: [PATCH] Fix possible bug in add-xid-whitelist logic (#1785)

* Fix possible bug in add-xid-whitelist logic

* use `partial` syntax

* use (when...) to ensure upsert only runs when there is data

* gitignore some generated clojure dev concerns
---
 .gitignore                |  6 +++++-
 bin/add-xid-whitelist.clj | 11 +++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index c88d975ec..708b6392d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
+.clj-kondo/
 .env
-prod.env
+.envrc
+.lsp/
 .vscode/settings.json
 build/
+prod.env
+xids.csv
diff --git a/bin/add-xid-whitelist.clj b/bin/add-xid-whitelist.clj
index 7f3914df0..75e2f4013 100755
--- a/bin/add-xid-whitelist.clj
+++ b/bin/add-xid-whitelist.clj
@@ -8,8 +8,8 @@
 
 (defn xid-seq [filename]
   (map
-    (fn [line] (first (str/split line #",")))
-    (line-seq (io/reader filename))))
+   (fn [line] (first (str/split line #",")))
+   (line-seq (io/reader filename))))
 
 (defn xid-record [owner xid]
   {:owner owner
@@ -25,11 +25,12 @@
         owner-id (resolve-owner-id opts-map)]
     (loop [xids-batch (take batch-size xids)
            xids-rest (drop batch-size xids)]
-      (when (seq xids-rest)
+      (when (seq xids-batch)
         (db/upsert! :xid_whitelist
                     :xid_whitelist_owner_xid_key
                     (map (partial xid-record owner-id)
-                         xids-batch))
+                         xids-batch)))
+      (when (seq xids-rest)
         (recur (take batch-size xids-rest)
                (drop batch-size xids-rest))))
     (println "Done")))
@@ -37,5 +38,3 @@
 
 (when (= *file* (System/getProperty "babashka.file"))
   (apply -main *command-line-args*))
-
-