Redirect to new username (#28) (#30)

u8views · Mar 17, 2024 · 60b9c60 · 60b9c60
1 parent 7d889d7
commit 60b9c60
Show file tree

Hide file tree

Showing 11 changed files with 153 additions and 6 deletions.
diff --git a/internal/controllers/web_controller.go b/internal/controllers/web_controller.go
@@ -116,6 +116,13 @@ func (c *WebController) GitHubProfile(ctx *gin.Context) {
 
 	currentPageProfile, err := c.getProfileByUsername(ctx, sessionProfile, uri.Username)
 	if err == sql.ErrNoRows {
+		username, err := c.userService.GetUsernameByOldUsername(ctx, dbs.SocialProviderGithub, uri.Username)
+		if err == nil {
+			ctx.Redirect(http.StatusTemporaryRedirect, "/github/"+username)
+
+			return
+		}
+
 		ctx.Data(http.StatusBadRequest, "text/html; charset=utf-8", []byte(fmt.Sprintf("User not found")))
 
 		return

diff --git a/internal/services/user_service.go b/internal/services/user_service.go
@@ -33,6 +33,13 @@ func (s *UserService) GetBySocialProviderUsername(ctx context.Context, provider
 	})
 }
 
+func (s *UserService) GetUsernameByOldUsername(ctx context.Context, provider dbs.SocialProvider, oldUsername string) (string, error) {
+	return s.repository.Queries().UsernameHistoryGetByOldUsername(ctx, dbs.UsernameHistoryGetByOldUsernameParams{
+		Username:       oldUsername,
+		SocialProvider: provider,
+	})
+}
+
 func (s *UserService) GetByID(ctx context.Context, id int64) (dbs.UsersGetByIDRow, error) {
 	return s.repository.Queries().UsersGetByID(ctx, id)
 }
@@ -119,6 +126,17 @@ func (s *UserService) Upsert(
 			return err
 		}
 
+		err = queries.UsernameHistoryNew(ctx, dbs.UsernameHistoryNewParams{
+			UserID:         txID,
+			SocialProvider: provider,
+			Username:       username,
+			CreatedAt:      now,
+			UpdatedAt:      now,
+		})
+		if err != nil {
+			return err
+		}
+
 		err = queries.ProfileTotalViewsNew(ctx, txID)
 		if err != nil {
 			return err

diff --git a/internal/storage/dbs/db.go b/internal/storage/dbs/db.go
diff --git a/internal/storage/dbs/models.go b/internal/storage/dbs/models.go
diff --git a/internal/storage/dbs/profile_hourly_views_stats.sql.go b/internal/storage/dbs/profile_hourly_views_stats.sql.go
diff --git a/internal/storage/dbs/profile_total_views.sql.go b/internal/storage/dbs/profile_total_views.sql.go
diff --git a/internal/storage/dbs/referrals.sql.go b/internal/storage/dbs/referrals.sql.go
diff --git a/internal/storage/dbs/username_history.sql.go b/internal/storage/dbs/username_history.sql.go
diff --git a/internal/storage/dbs/users.sql.go b/internal/storage/dbs/users.sql.go
diff --git a/internal/storage/migrations/20240306163810_username_history.sql b/internal/storage/migrations/20240306163810_username_history.sql
@@ -0,0 +1,18 @@
+-- +goose Up
+-- +goose StatementBegin
+CREATE TABLE username_history
+(
+    id                 BIGSERIAL       NOT NULL PRIMARY KEY,
+    user_id            BIGINT          NOT NULL REFERENCES users (id),
+    social_provider    SOCIAL_PROVIDER NOT NULL,
+    canonical_username VARCHAR         NOT NULL,
+    created_at         TIMESTAMP       NOT NULL,
+    updated_at         TIMESTAMP       NOT NULL,
+    UNIQUE (canonical_username, social_provider, user_id)
+);
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+DROP TABLE username_history;
+-- +goose StatementEnd
diff --git a/internal/storage/queries/username_history.sql b/internal/storage/queries/username_history.sql
@@ -0,0 +1,15 @@
+-- name: UsernameHistoryNew :exec
+INSERT INTO username_history (user_id, social_provider, canonical_username, created_at, updated_at)
+VALUES (@user_id, @social_provider, LOWER(@username), @created_at, @updated_at)
+ON CONFLICT (canonical_username, social_provider, user_id) DO UPDATE
+    SET updated_at = excluded.updated_at;
+
+-- name: UsernameHistoryGetByOldUsername :one
+SELECT u.username
+FROM username_history uh
+JOIN users u 
+  ON uh.user_id = u.id
+WHERE uh.canonical_username = LOWER(@username)
+  AND uh.social_provider = @social_provider
+ORDER BY uh.updated_at DESC
+LIMIT 1;