From f490d45300f0319f025c9ea93d538d21dfd9e61d Mon Sep 17 00:00:00 2001
From: Sergey Chubaryan <serghio2@yandex.ru>
Date: Sun, 23 Feb 2025 16:34:24 +0300
Subject: [PATCH] shortlinks fix

---
 internal/core/repos/shortlink_repo.go |  6 +++---
 sql/01_user.sql                       |  2 --
 sql/02_shortlinks.sql                 | 17 ++---------------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/internal/core/repos/shortlink_repo.go b/internal/core/repos/shortlink_repo.go
index 2db06ce..565e4db 100644
--- a/internal/core/repos/shortlink_repo.go
+++ b/internal/core/repos/shortlink_repo.go
@@ -35,8 +35,8 @@ func (u *shortlinkRepo) AddShortlink(ctx context.Context, dto ShortlinkDTO) erro
 	_, span := u.tracer.Start(ctx, "postgres::AddShortlink")
 	defer span.End()
 
-	query := `insert into shortlinks (url, expires_at) values ($1, $2);`
-	_, err := u.db.ExecContext(ctx, query, dto.Url, dto.ExpiresAt)
+	query := `insert into shortlinks (id, url, expires_at) values ($1, $2, $3);`
+	_, err := u.db.ExecContext(ctx, query, dto.Id, dto.Url, dto.ExpiresAt)
 	return err
 }
 
@@ -72,7 +72,7 @@ func (u *shortlinkRepo) DeleteExpiredShortlinks(ctx context.Context, limit int)
 		where id in (
 			select id
 				from shortlinks
-				where current_date > expiration
+				where current_date > expires_at
 				limit $1
 		)
 		returning *
diff --git a/sql/01_user.sql b/sql/01_user.sql
index 1b38857..fd39f6a 100644
--- a/sql/01_user.sql
+++ b/sql/01_user.sql
@@ -9,8 +9,6 @@ create table if not exists users (
     updated_at timestamp
 );
 
-alter table users alter column active set default true;
-
 create index if not exists idx_users_email on users(email);
 
 create or replace trigger trg_user_created
diff --git a/sql/02_shortlinks.sql b/sql/02_shortlinks.sql
index bb0611a..e85199b 100644
--- a/sql/02_shortlinks.sql
+++ b/sql/02_shortlinks.sql
@@ -1,18 +1,5 @@
 create table if not exists shortlinks (
-    id int generated always as identity,
+    id text primary key,
     url text not null,
-    expires_at timestamp not null,
-    created_at timestamp,
-    updated_at timestamp
+    expires_at timestamp not null
 );
-
-create or replace trigger trg_shortlink_created
-    before insert on shortlinks
-    for each row
-    execute function trg_proc_row_created();
-
-create or replace trigger trg_shortlink_updated
-    before update on shortlinks
-    for each row 
-    when (new is distinct from old)
-    execute function trg_proc_row_updated();
\ No newline at end of file