Small changes

internal/db/database.go

@@ -14,6 +14,20 @@ type Database struct {
 	client *pgx.Conn
 }
 
+type URL struct {
+	ShortURL  string    `json:"shorturl"`
+	URL       string    `json:"url"`
+	ExpiresAt time.Time `json:"expires_at"`
+}
+
+type PageVisit struct {
+	ShortURL   string    `json:"shorturl"`
+	Count      int       `json:"count"`
+	IP_Address string    `json:"ip_address"`
+	UserAgent  string    `json:"user_agent"`
+	CreatedAt  time.Time `json:"created_at"`
+}
+
 func NewDatabaseClient(config utils.DatabaseConfig) (*Database, error) {
 	conn, err := pgx.Connect(context.Background(), utils.DatabaseUrl())
 	if err != nil {
@@ -24,15 +38,47 @@ func NewDatabaseClient(config utils.DatabaseConfig) (*Database, error) {
 	return &Database{client: conn}, nil
 }
 
-func (d *Database) InsertNewURL(shorturl string, url string) error {
+func (d *Database) InsertNewURL(u URL) error {
+	fmt.Print("InsertNewURL called with URL: ", u.URL)
 	timeNow := time.Now()
-	_, err := d.client.Exec(context.Background(), "INSERT INTO urls (shorturl, url, created_at) VALUES ($1, $2, $3)", shorturl, url, timeNow)
+	_, err := d.client.Exec(context.Background(), "INSERT INTO urls (shorturl, url, created_at,expires_at,active) VALUES ($1, $2, $3,$4,$5)", u.ShortURL, u.URL, timeNow, u.ExpiresAt, true)
 	if err != nil {
 		return fmt.Errorf("failed to insert URL into database: %w", err)
 	}
 	return nil
 }
 
+func (d *Database) InsertAnalytics(p PageVisit) error {
+	timeNow := time.Now()
+	_, err := d.client.Exec(context.Background(), "INSERT INTO analytics (shorturl, count, ip_address, user_agent, created_at) VALUES ($1, $2, $3, $4, $5)", p.ShortURL, p.Count, p.IP_Address, p.UserAgent, timeNow)
+	if err != nil {
+		return fmt.Errorf("failed to insert analytics into database: %w", err)
+	}
+	return nil
+}
+
+func (d *Database) GetAnalytics(shorturl string) ([]PageVisit, error) {
+	rows, err := d.client.Query(context.Background(), "SELECT shorturl, count, ip_address, user_agent, created_at FROM analytics WHERE shorturl = $1", shorturl)
+	if err != nil {
+		return nil, fmt.Errorf("failed to retrieve analytics from database: %w", err)
+	}
+	defer rows.Close()
+
+	var analytics []PageVisit
+	for rows.Next() {
+		var p PageVisit
+		err := rows.Scan(&p.ShortURL, &p.Count, &p.IP_Address, &p.UserAgent, &p.CreatedAt)
+		if err != nil {
+			return nil, fmt.Errorf("failed to scan analytics row: %w", err)
+		}
+		analytics = append(analytics, p)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, fmt.Errorf("error iterating over analytics rows: %w", err)
+	}
+	return analytics, nil
+}
+
 func (d *Database) DeleteURL(shorturl string) error {
 	_, err := d.client.Exec(context.Background(), "DELETE FROM urls WHERE shorturl = $1", shorturl)
 	if err != nil {

internal/db/migrations/20250806_initial.sql

@@ -0,0 +1,20 @@
+CREATE TABLE urls (
+    shorturl VARCHAR(7) PRIMARY KEY,
+    url VARCHAR(100) NOT NULL,
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    expires_at TIMESTAMP DEFAULT NULL,
+    active BOOLEAN DEFAULT TRUE
+
+);
+
+CREATE TABLE analytics (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    shorturl VARCHAR(7) NOT NULL,
+    count INTEGER DEFAULT 0,
+    ip_address VARCHAR(50) DEFAULT NULL,
+    user_agent VARCHAR(1024) DEFAULT NULL,
+    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    FOREIGN KEY (shorturl) REFERENCES urls(shorturl),
+
+);