feat(like counter): counter implemented

like counter and related db changes implemented along with bug fixes

Author: prinzpiuz

.gitignore

@@ -31,3 +31,4 @@ __debug_*
 # DB files
 BloTils.db
 *.db
+*.session.sql

config.json

@@ -6,7 +6,8 @@
       "DBLocation": "./BloTils.db",
       "Vacuum": "full",
       "ForeignKeys": true
-    }
+    },
+    "StaticFiles": "static"
   },
 
   "Name": "BloTils",

go.mod

@@ -7,7 +7,10 @@ require (
 	github.com/mattn/go-sqlite3 v1.14.22
 )
 
-require github.com/felixge/httpsnoop v1.0.3 // indirect
+require (
+	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/rs/cors v1.11.1 // indirect
+)
 
 require (
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect

go.sum

@@ -27,6 +27,8 @@ github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
+github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

src/app/app.go

@@ -65,5 +65,6 @@ func New(config Config) *App {
 		Config: config,
 	}
 	routes.RegisterRoutes(server)
+	routes.ServeStaticFiles(server)
 	return app
 }

src/db/migrations/000001_create_likes_table.up.sql

@@ -1,27 +1,34 @@
 CREATE TABLE IF NOT EXISTS DomainSettings (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
-	likes NUMERIC,
-	comments NUMERIC,
+    likes NUMERIC check(
+        likes = 0
+        or likes = 1
+    ),
+    comments NUMERIC check(
+        comments = 0
+        or comments = 1
+    ),
     created_time DATETIME DEFAULT CURRENT_TIMESTAMP
 );
 CREATE TABLE IF NOT EXISTS Domain (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     settings_id INTEGER,
-	domain VARCHAR(255),
+    domain VARCHAR(255) UNIQUE,
     created_time DATETIME DEFAULT CURRENT_TIMESTAMP,
     FOREIGN KEY (settings_id) REFERENCES DomainSettings(id)
 );
 CREATE TABLE IF NOT EXISTS Liked_IPs (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
-	ip VARCHAR(255),
-    count INTEGER,
+    ip VARCHAR(255) UNIQUE,
+    count INTEGER check(count >= 0),
+    domain VARCHAR(255),
+    path TEXT,
     created_time DATETIME DEFAULT CURRENT_TIMESTAMP
 );
 CREATE TABLE IF NOT EXISTS Likes (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
-	uri TEXT,
-	count INTEGER,
+    uri TEXT UNIQUE,
+    count INTEGER check(count >= 0),
     domain_id INTEGER,
-    created_time DATETIME DEFAULT CURRENT_TIMESTAMP,
     FOREIGN KEY (domain_id) REFERENCES Domain(id)
 );

src/db/models.go

@@ -18,7 +18,7 @@ type DomainSettings struct {
 // The domain field contains the domain name.
 // The timestamp field contains the timestamp for when the domain was created or updated.
 type Domain struct {
-	id        int
+	ID        int
 	settings  DomainSettings
 	domain    string
 	timestamp time.Time
@@ -47,20 +47,30 @@ func (domain Domain) CommentsEnabled() bool {
 // The timestamp field is the timestamp of when the like was created.
 type Likes struct {
 	id        int
-	domain    Domain
-	uri       string
-	count     int
-	timestamp time.Time
+	domain_id int
+	Domain    Domain
+	URI       string
+	Count     int
 }
 
 func (likes Likes) IsEmpty() bool {
 	return likes == Likes{}
 }
 
+func (likes Likes) GetDomainID() int {
+	return likes.Domain.ID
+}
+
 // LikedIPs represents a record of an IP address that has liked something, along with the count of likes and the timestamp of the last like.
 type LikedIPs struct {
 	id        int
-	ip        string
-	count     int
+	IP        string
+	Count     int
+	Domain    string
+	Path      string
 	timestamp time.Time
 }
+
+func (likedIPs LikedIPs) IsEmpty() bool {
+	return likedIPs == LikedIPs{}
+}

src/db/query.go

@@ -1,20 +1,57 @@
 // Package db provides functionality for interacting with the database.
 package db
 
-// getDomainQuery is a SQL query that selects all rows from the Domain and DomainSettings tables
+// getDomain is a SQL query that selects all rows from the Domain and DomainSettings tables
 // where the domain column in the Domain table matches the provided parameter.
 // The query joins the two tables on the id column.
-const getDomainQuery string = `SELECT * FROM Domain
-							   JOIN DomainSettings
-							   ON Domain.id = DomainSettings.id
-							   WHERE domain = ?`
+const getDomain = `SELECT * FROM Domain
+				   JOIN DomainSettings
+				   ON Domain.id = DomainSettings.id
+				   WHERE domain = ?`
 
-// getLikesQuery is a SQL query that selects all rows from the Likes table
+// getLikes is a SQL query that selects all rows from the Likes table
 // where the uri matches the provided value, and the domain matches the
 // provided domain. It joins the Likes table with the Domain table to
 // retrieve the domain information.
-const getLikesQuery string = `SELECT * FROM Likes
-							  JOIN Domain
-							  ON Likes.domain_id = Domain.id
-							  where Domain.domain = ?
-							  AND Likes.uri = ?`
+const getLikes = `SELECT
+				  Likes.id,
+				  Likes.uri,
+				  Likes.domain_id,
+				  Likes.count,
+				  Domain.id,
+				  Domain.settings_id,
+				  Domain.domain,
+				  Domain.created_time
+				  FROM Likes
+				  JOIN Domain
+				  ON Likes.domain_id = Domain.id
+				  WHERE Domain.domain = ?
+				  AND Likes.uri = ?`
+
+// getIPlikedOrNot is a SQL query that selects all rows from the Liked_IPs table
+// where the ip, path, and domain columns match the provided parameters. This query
+// is used to check if a specific IP address has already been liked for a given
+// domain and path.
+const getIPlikedOrNot = `SELECT * FROM Liked_IPs
+						 WHERE Liked_IPs.ip = ?
+						 AND Liked_IPs.domain = ?
+						 AND Liked_IPs.path = ?`
+
+// updateOrInsertLikedIP is a SQL query that inserts a new row into the Liked_IPs table
+// with the provided IP address, an initial count of 1, and the current timestamp. If a
+// row already exists for the provided IP address, the query updates the existing row by
+// incrementing the Count column by 1.
+const updateOrInsertLikedIP = `INSERT INTO Liked_IPs(domain, path, ip, count, created_time)
+							   VALUES(?, ?, ?, 1, datetime())
+							   ON CONFLICT(ip)
+							   DO UPDATE
+							   SET count = count + 1`
+
+// updateLike is a SQL query that inserts a new row into the Likes table with the provided uri and domain_id,
+// and an initial count of 1. If a row already exists for the provided uri and domain_id, the query updates
+// the existing row by incrementing the count column by 1.
+const updateLike = `INSERT INTO Likes(uri, count, domain_id)
+					VALUES (?, 1, ?)
+					ON CONFLICT(uri)
+					DO UPDATE
+					SET count = count + 1`

src/db/utils.go

@@ -11,7 +11,7 @@ import (
 // If the domain is not found, it returns an empty Domain.
 func GetDomain(db *sql.DB, domain_name string) Domain {
 	var domain Domain
-	err := db.QueryRow(getDomainQuery, domain_name).Scan(&domain.id,
+	err := db.QueryRow(getDomain, domain_name).Scan(&domain.ID,
 		&domain.settings.id,
 		&domain.domain,
 		&domain.timestamp,
@@ -32,15 +32,15 @@ func GetDomain(db *sql.DB, domain_name string) Domain {
 
 func GetLikes(db *sql.DB, domain_name string, page string) Likes {
 	var likes Likes
-	err := db.QueryRow(getLikesQuery, domain_name, page).Scan(&likes.id,
-		&likes.uri,
-		&likes.count,
-		&likes.domain.id,
-		&likes.timestamp,
-		&likes.domain.id,
-		&likes.domain.settings.id,
-		&likes.domain.domain,
-		&likes.domain.timestamp)
+	err := db.QueryRow(getLikes, domain_name, page).Scan(
+		&likes.id,
+		&likes.URI,
+		&likes.domain_id,
+		&likes.Count,
+		&likes.Domain.ID,
+		&likes.Domain.settings.id,
+		&likes.Domain.domain,
+		&likes.Domain.timestamp)
 	if err != nil {
 		if err == sql.ErrNoRows {
 			log.Printf("DB: Likes On %s, Not Found In %s", page, domain_name)
@@ -51,3 +51,35 @@ func GetLikes(db *sql.DB, domain_name string, page string) Likes {
 	}
 	return likes
 }
+
+func GetLikedIP(db *sql.DB, domain string, page string, ip string) LikedIPs {
+	var likedIP LikedIPs
+	err := db.QueryRow(getIPlikedOrNot, ip, domain, page).Scan(&likedIP.id,
+		&likedIP.IP,
+		&likedIP.Count,
+		&likedIP.Domain,
+		&likedIP.Path,
+		&likedIP.timestamp)
+	if err != nil {
+		if err == sql.ErrNoRows {
+			log.Printf("DB: IP %s, Not Found Liked in %s for %s", ip, domain, page)
+			return LikedIPs{}
+		}
+		log.Printf("Error Getting Likes On %s For %s: %v", ip, page, err)
+		return LikedIPs{}
+	}
+	return likedIP
+}
+
+func UpdateIPLikeCount(db *sql.DB, domain string, path string, ip string) {
+	_, err := db.Exec(updateOrInsertLikedIP, domain, path, ip)
+	if err != nil {
+		log.Printf("Error Updating IP Like Count: %v", err)
+	}
+
+}
+
+func UpdateLikeCount(db *sql.DB, page string, doamin_id int) error {
+	_, err := db.Exec(updateLike, page, doamin_id)
+	return err
+}