From 694f6c3313525dfbf8ecf319d39f58d03679c3fe Mon Sep 17 00:00:00 2001 From: GoHorse Deploy Date: Sun, 15 Feb 2026 16:03:40 +0000 Subject: [PATCH] chore: commit pending changes --- backend/internal/core/usecases/user/update_user.go | 11 +---------- backend/internal/database/database.go | 10 ++++++++++ backend/internal/handlers/application_handler.go | 2 +- backend/internal/handlers/ticket_handler.go | 4 ++-- backend/internal/services/company_follower_service.go | 1 - backend/internal/services/favorite_job_service.go | 1 - ..._users.sql => 037_add_profile_fields_to_users.sql} | 0 ...okens.sql => 038_create_password_reset_tokens.sql} | 0 ...kets_table.sql => 039_create_tickets_table_v2.sql} | 0 ...s_table.sql => 040_create_activity_logs_table.sql} | 0 ...able.sql => 041_create_notifications_table_v2.sql} | 0 ...views.sql => 042_add_view_count_and_job_views.sql} | 0 ...scription.sql => 043_add_company_subscription.sql} | 0 seeder-api/src/db.js | 11 +++++++++++ 14 files changed, 25 insertions(+), 15 deletions(-) rename backend/migrations/{013_add_profile_fields_to_users.sql => 037_add_profile_fields_to_users.sql} (100%) rename backend/migrations/{014_create_password_reset_tokens.sql => 038_create_password_reset_tokens.sql} (100%) rename backend/migrations/{015_create_tickets_table.sql => 039_create_tickets_table_v2.sql} (100%) rename backend/migrations/{016_create_activity_logs_table.sql => 040_create_activity_logs_table.sql} (100%) rename backend/migrations/{017_create_notifications_table.sql => 041_create_notifications_table_v2.sql} (100%) rename backend/migrations/{018_add_view_count_and_job_views.sql => 042_add_view_count_and_job_views.sql} (100%) rename backend/migrations/{019_add_company_subscription.sql => 043_add_company_subscription.sql} (100%) diff --git a/backend/internal/core/usecases/user/update_user.go b/backend/internal/core/usecases/user/update_user.go index 2e9bff4..45b8883 100644 --- a/backend/internal/core/usecases/user/update_user.go +++ b/backend/internal/core/usecases/user/update_user.go @@ -69,22 +69,13 @@ func (uc *UpdateUserUseCase) Execute(ctx context.Context, id, tenantID string, i user.AvatarUrl = *input.AvatarUrl } - // HEAD Extra Fields - if input.Bio != nil { - user.Bio = *input.Bio - } + // Profile Fields if input.ProfilePictureURL != nil { user.ProfilePictureURL = *input.ProfilePictureURL } if len(input.Skills) > 0 { user.Skills = input.Skills } - if len(input.Experience) > 0 { - user.Experience = input.Experience - } - if len(input.Education) > 0 { - user.Education = input.Education - } // 4. Save updated, err := uc.userRepo.Update(ctx, user) diff --git a/backend/internal/database/database.go b/backend/internal/database/database.go index c50b57d..0e0eb1b 100644 --- a/backend/internal/database/database.go +++ b/backend/internal/database/database.go @@ -147,6 +147,16 @@ func executeMigration(filename, sqlContent string) error { return err } log.Printf("⏭️ Migration %s skipped due to existing resources", filename) + tx.Rollback() + tx2, err := DB.Begin() + if err != nil { + return err + } + defer tx2.Rollback() + if _, err := tx2.Exec("INSERT INTO schema_migrations (filename) VALUES ($1)", filename); err != nil { + return err + } + return tx2.Commit() } if _, err := tx.Exec("INSERT INTO schema_migrations (filename) VALUES ($1)", filename); err != nil { diff --git a/backend/internal/handlers/application_handler.go b/backend/internal/handlers/application_handler.go index 97b397c..72451ea 100644 --- a/backend/internal/handlers/application_handler.go +++ b/backend/internal/handlers/application_handler.go @@ -164,7 +164,7 @@ func (h *ApplicationHandler) ListUserApplications(w http.ResponseWriter, r *http return } - apps, err := h.Service.ListUserApplications(userID) + apps, err := h.Service.GetApplicationsByUser(userID) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return diff --git a/backend/internal/handlers/ticket_handler.go b/backend/internal/handlers/ticket_handler.go index ab3d623..3130244 100644 --- a/backend/internal/handlers/ticket_handler.go +++ b/backend/internal/handlers/ticket_handler.go @@ -78,7 +78,7 @@ func (h *TicketHandler) GetTicketByID(w http.ResponseWriter, r *http.Request) { return } - ticket, messages, err := h.service.GetTicket(r.Context(), id, userID) + ticket, messages, err := h.service.GetTicket(r.Context(), id, userID, false) if err != nil { http.Error(w, err.Error(), http.StatusNotFound) return @@ -118,7 +118,7 @@ func (h *TicketHandler) AddTicketMessage(w http.ResponseWriter, r *http.Request) return } - msg, err := h.service.AddMessage(r.Context(), id, userID, req.Message) + msg, err := h.service.AddMessage(r.Context(), id, userID, req.Message, false) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return diff --git a/backend/internal/services/company_follower_service.go b/backend/internal/services/company_follower_service.go index ee875ab..f81345d 100644 --- a/backend/internal/services/company_follower_service.go +++ b/backend/internal/services/company_follower_service.go @@ -2,7 +2,6 @@ package services import ( "database/sql" - "fmt" "time" "github.com/rede5/gohorsejobs/backend/internal/models" diff --git a/backend/internal/services/favorite_job_service.go b/backend/internal/services/favorite_job_service.go index 09d5aa9..079f00a 100644 --- a/backend/internal/services/favorite_job_service.go +++ b/backend/internal/services/favorite_job_service.go @@ -2,7 +2,6 @@ package services import ( "database/sql" - "fmt" "time" "github.com/rede5/gohorsejobs/backend/internal/models" diff --git a/backend/migrations/013_add_profile_fields_to_users.sql b/backend/migrations/037_add_profile_fields_to_users.sql similarity index 100% rename from backend/migrations/013_add_profile_fields_to_users.sql rename to backend/migrations/037_add_profile_fields_to_users.sql diff --git a/backend/migrations/014_create_password_reset_tokens.sql b/backend/migrations/038_create_password_reset_tokens.sql similarity index 100% rename from backend/migrations/014_create_password_reset_tokens.sql rename to backend/migrations/038_create_password_reset_tokens.sql diff --git a/backend/migrations/015_create_tickets_table.sql b/backend/migrations/039_create_tickets_table_v2.sql similarity index 100% rename from backend/migrations/015_create_tickets_table.sql rename to backend/migrations/039_create_tickets_table_v2.sql diff --git a/backend/migrations/016_create_activity_logs_table.sql b/backend/migrations/040_create_activity_logs_table.sql similarity index 100% rename from backend/migrations/016_create_activity_logs_table.sql rename to backend/migrations/040_create_activity_logs_table.sql diff --git a/backend/migrations/017_create_notifications_table.sql b/backend/migrations/041_create_notifications_table_v2.sql similarity index 100% rename from backend/migrations/017_create_notifications_table.sql rename to backend/migrations/041_create_notifications_table_v2.sql diff --git a/backend/migrations/018_add_view_count_and_job_views.sql b/backend/migrations/042_add_view_count_and_job_views.sql similarity index 100% rename from backend/migrations/018_add_view_count_and_job_views.sql rename to backend/migrations/042_add_view_count_and_job_views.sql diff --git a/backend/migrations/019_add_company_subscription.sql b/backend/migrations/043_add_company_subscription.sql similarity index 100% rename from backend/migrations/019_add_company_subscription.sql rename to backend/migrations/043_add_company_subscription.sql diff --git a/seeder-api/src/db.js b/seeder-api/src/db.js index ad9a1db..231fe8f 100644 --- a/seeder-api/src/db.js +++ b/seeder-api/src/db.js @@ -39,6 +39,17 @@ console.log('🔌 DB Config:', { // Database connection configuration export const pool = new Pool(config); +// Set search_path after connection +const originalConnect = pool.connect.bind(pool); +pool.connect = async () => { + const client = await originalConnect(); + const dbUrl = process.env.DATABASE_URL || ''; + if (dbUrl.includes('search_path=')) { + await client.query("SET search_path TO ghj"); + } + return client; +}; + // Test database connection export async function testConnection() { try {