Merge pull request #12 from joshsoftware/fix/login-timestamp-type

Fix login service fail due to changed column type

Author: VishakhaSainani-Josh

internal/app/auth/domain.go

@@ -1,6 +1,9 @@
 package auth
 
-import "database/sql"
+import (
+	"database/sql"
+	"time"
+)
 
 const (
 	LoginWithGithubFailed = "LoginWithGithubFailed"
@@ -23,9 +26,9 @@ type User struct {
 	IsAdmin             bool          `json:"is_admin"`
 	Password            string        `json:"password"`
 	IsDeleted           bool          `json:"is_deleted"`
-	DeletedAt           sql.NullInt64 `json:"deleted_at"`
-	CreatedAt           int64         `json:"created_at"`
-	UpdatedAt           int64         `json:"updated_at"`
+	DeletedAt           sql.NullTime  `json:"deleted_at"`
+	CreatedAt           time.Time     `json:"created_at"`
+	UpdatedAt           time.Time     `json:"updated_at"`
 }
 
 type GithubUserResponse struct {

internal/app/user/domain.go

@@ -1,6 +1,9 @@
 package user
 
-import "database/sql"
+import (
+	"database/sql"
+	"time"
+)
 
 type User struct {
 	Id                  int           `json:"user_id"`
@@ -14,9 +17,9 @@ type User struct {
 	IsAdmin             bool          `json:"is_admin"`
 	Password            string        `json:"password"`
 	IsDeleted           bool          `json:"is_deleted"`
-	DeletedAt           sql.NullInt64  `json:"deleted_at"`
-	CreatedAt           int64        `json:"created_at"`
-	UpdatedAt           int64        `json:"updated_at"`
+	DeletedAt           sql.NullTime  `json:"deleted_at"`
+	CreatedAt           time.Time        `json:"created_at"`
+	UpdatedAt           time.Time        `json:"updated_at"`
 }
 
 type CreateUserRequestBody struct {

internal/repository/domain.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"database/sql"
+	"time"
 )
 
 type User struct {
@@ -16,9 +17,9 @@ type User struct {
 	IsAdmin             bool
 	Password            string
 	IsDeleted           bool
-	DeletedAt           sql.NullInt64
-	CreatedAt           int64
-	UpdatedAt           int64
+	DeletedAt           sql.NullTime
+	CreatedAt           time.Time
+	UpdatedAt           time.Time
 }
 
 type CreateUserRequestBody struct {

internal/repository/user.go

@@ -39,14 +39,12 @@ const (
 	github_id, 
 	github_username, 
 	email, 
-	avatar_url, 
-	created_at, 
-	updated_at
+	avatar_url
 	) 
-	VALUES ($1, $2, $3, $4, $5, $6) 
+	VALUES ($1, $2, $3, $4) 
 	RETURNING *`
 
-	updateEmailQuery = "UPDATE users SET email=$1 where id=$2"
+	updateEmailQuery = "UPDATE users SET email=$1, updated_at=$2 where id=$3"
 )
 
 func (ur *userRepository) GetUserById(ctx context.Context, tx *sqlx.Tx, userId int) (User, error) {
@@ -122,8 +120,6 @@ func (ur *userRepository) CreateUser(ctx context.Context, tx *sqlx.Tx, userInfo
 		userInfo.GithubUsername,
 		userInfo.Email,
 		userInfo.AvatarUrl,
-		time.Now().Unix(),
-		time.Now().Unix(),
 	).Scan(
 		&user.Id,
 		&user.GithubId,
@@ -149,10 +145,10 @@ func (ur *userRepository) CreateUser(ctx context.Context, tx *sqlx.Tx, userInfo
 
 }
 
-func (ur *userRepository) UpdateUserEmail(ctx context.Context, tx *sqlx.Tx, Id int, email string) error {
+func (ur *userRepository) UpdateUserEmail(ctx context.Context, tx *sqlx.Tx, userId int, email string) error {
 	executer := ur.BaseRepository.initiateQueryExecuter(tx)
 
-	_, err := executer.ExecContext(ctx, updateEmailQuery, email, Id)
+	_, err := executer.ExecContext(ctx, updateEmailQuery, email, time.Now(), userId)
 	if err != nil {
 		slog.Error("failed to update user email", "error", err)
 		return apperrors.ErrInternalServer