Deduplicate open requests to simplify bot logic

openSUSE · Jan 9, 2025 · 602bf45 · 602bf45
1 parent dddb4b8
commit 602bf45
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/Cavil/Model/Requests.pm b/lib/Cavil/Model/Requests.pm
@@ -19,8 +19,9 @@ use Mojo::Base -base, -signatures;
 has 'pg';
 
 sub add ($self, $link, $pkg) {
-  my $req = {external_link => $link, package => $pkg};
-  return $self->pg->db->insert('bot_requests', $req, {returning => 'id'})->hash->{id};
+  my $db = $self->pg->db;
+  $db->query('INSERT INTO bot_requests (external_link, package) VALUES (?, ?) ON CONFLICT DO NOTHING', $link, $pkg);
+  return $db->query('SELECT id FROM bot_requests WHERE external_link = ? AND package = ?', $link, $pkg)->hash->{id};
 }
 
 sub all ($self) {

diff --git a/migrations/cavil.sql b/migrations/cavil.sql
@@ -238,3 +238,6 @@ ALTER TABLE snippets ADD COLUMN package int REFERENCES bot_packages(id) ON DELET
 
 -- 25 up
 ALTER TABLE bot_sources ADD COLUMN type text DEFAULT 'obs' NOT NULL;
+
+-- 26 up
+CREATE UNIQUE INDEX ON bot_requests(external_link, package);
-Original file line number
+Diff line change
@@ Expand Up @@
     -- 25 up
     ALTER TABLE bot_sources ADD COLUMN type text DEFAULT 'obs' NOT NULL;
+    -- 26 up
+    CREATE UNIQUE INDEX ON bot_requests(external_link, package);