From a5102bc5a45feaf41e9d2fe1ebbe6bd0b2f946e8 Mon Sep 17 00:00:00 2001
From: Chuck Findlay <chuck@findlayis.me>
Date: Thu, 23 May 2024 13:55:03 -0300
Subject: [PATCH] target channel is not unique

---
 webhook/subscription.go      | 2 +-
 webhook/subscription_test.go | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webhook/subscription.go b/webhook/subscription.go
index b3ad31e..2e83426 100644
--- a/webhook/subscription.go
+++ b/webhook/subscription.go
@@ -12,7 +12,7 @@ func SubscribePrivmsg(target string, url string) bool {
 	db := database.DB.GetDB()
 
 	// Create the table if it doesn't exist
-	_, err := db.Exec("CREATE TABLE IF NOT EXISTS PrivmsgSubscriptions (Target TEXT PRIMARY KEY, URL TEXT, FailureCount INTEGER DEFAULT 0, Timestamp DATETIME DEFAULT CURRENT_TIMESTAMP)")
+	_, err := db.Exec("CREATE TABLE IF NOT EXISTS PrivmsgSubscriptions (Target TEXT, URL TEXT, FailureCount INTEGER DEFAULT 0, Timestamp DATETIME DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (Target, URL))")
 	if err != nil {
 		log.Printf("Error creating table: %v", err)
 		return false
diff --git a/webhook/subscription_test.go b/webhook/subscription_test.go
index 0f48c00..21d158a 100644
--- a/webhook/subscription_test.go
+++ b/webhook/subscription_test.go
@@ -19,7 +19,7 @@ func TestSubscribePrivmsg(t *testing.T) {
 	database.DB.SetDB(db)
 
 	// Expectations
-	mock.ExpectExec("CREATE TABLE IF NOT EXISTS PrivmsgSubscriptions").WillReturnResult(sqlmock.NewResult(1, 1))
+	mock.ExpectExec("CREATE TABLE IF NOT EXISTS PrivmsgSubscriptions \\(Target TEXT, URL TEXT, FailureCount INTEGER DEFAULT 0, Timestamp DATETIME DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY \\(Target, URL\\)\\)").WillReturnResult(sqlmock.NewResult(1, 1))
 	mock.ExpectBegin()
 
 	// Expect the SELECT query
@@ -48,7 +48,7 @@ func TestSubscribePrivmsgExistsAndDoesnt(t *testing.T) {
 	database.DB.SetDB(db)
 
 	// Expectations for the first call
-	mock.ExpectExec("CREATE TABLE IF NOT EXISTS PrivmsgSubscriptions").WillReturnResult(sqlmock.NewResult(1, 1))
+	mock.ExpectExec("CREATE TABLE IF NOT EXISTS PrivmsgSubscriptions \\(Target TEXT, URL TEXT, FailureCount INTEGER DEFAULT 0, Timestamp DATETIME DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY \\(Target, URL\\)\\)").WillReturnResult(sqlmock.NewResult(1, 1))
 	mock.ExpectBegin()
 
 	// Expect the SELECT query
@@ -66,7 +66,7 @@ func TestSubscribePrivmsgExistsAndDoesnt(t *testing.T) {
 	require.False(t, result, "Expected false")
 
 	// Expectations for the second call
-	mock.ExpectExec("CREATE TABLE IF NOT EXISTS PrivmsgSubscriptions").WillReturnResult(sqlmock.NewResult(1, 1))
+	mock.ExpectExec("CREATE TABLE IF NOT EXISTS PrivmsgSubscriptions \\(Target TEXT, URL TEXT, FailureCount INTEGER DEFAULT 0, Timestamp DATETIME DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY \\(Target, URL\\)\\)").WillReturnResult(sqlmock.NewResult(1, 1))
 	mock.ExpectBegin()
 
 	// Expect the SELECT query