feat(db): modify migration file

Author: Bolu1

db/migrations/20250618100321_initial_setup.sql

@@ -5,12 +5,18 @@ CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
 -- Core User and Account Management
 CREATE TABLE users (
     id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+    first_name VARCHAR(255),
+    last_name VARCHAR(255),
+    phone_number VARCHAR(50),
     email VARCHAR(255) UNIQUE NOT NULL,
     password_hash VARCHAR(255),
+    profile_picture_url VARCHAR(255),
     auth_provider VARCHAR(50),
     provider_id VARCHAR(255),
     email_verified BOOLEAN DEFAULT FALSE,
     email_verified_at TIMESTAMPTZ,
+    phone_number_verified BOOLEAN DEFAULT FALSE,
+    phone_number_verified_at TIMESTAMPTZ,
     account_type VARCHAR(50) NOT NULL,
     account_status VARCHAR(50) DEFAULT 'pending',
     two_factor_enabled BOOLEAN DEFAULT FALSE,
@@ -23,13 +29,8 @@ CREATE TABLE users (
 );
 
 CREATE TABLE personal_users (
-    id UUID PRIMARY KEY REFERENCES users(id) ON DELETE CASCADE,
-    first_name VARCHAR(255),
-    last_name VARCHAR(255),
-    profile_picture VARCHAR(255),
-    phone_number VARCHAR(50),
-    phone_number_verified BOOLEAN DEFAULT FALSE,
-    phone_number_verified_at TIMESTAMPTZ,
+    id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+    user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
     nationality VARCHAR(255),
     residential_country VARCHAR(255),
     user_address VARCHAR(255),
@@ -102,24 +103,11 @@ CREATE TABLE company_users (
     permissions JSONB,
     is_active BOOLEAN DEFAULT TRUE,
     added_by UUID REFERENCES users(id),
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
-    UNIQUE(company_id, user_id)
-);
-
-CREATE TABLE company_staff_profiles (
-    id UUID PRIMARY KEY REFERENCES company_users(id) ON DELETE CASCADE,
-    first_name VARCHAR(255),
-    last_name VARCHAR(255),
-    profile_picture VARCHAR(255),
-    phone_number VARCHAR(50),
-    email VARCHAR(255),
-    department VARCHAR(100),
-    job_title VARCHAR(255),
     reports_to UUID REFERENCES company_users(id),
     hire_date DATE,
     created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW()
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    UNIQUE(company_id, user_id)
 );
 
 CREATE TABLE company_employees (
@@ -158,7 +146,6 @@ CREATE INDEX idx_company_employees_user_id ON company_employees(user_id);
 
 -- +goose Down
 DROP TABLE IF EXISTS company_employees CASCADE;
-DROP TABLE IF EXISTS company_staff_profiles CASCADE;
 DROP TABLE IF EXISTS company_users CASCADE;
 DROP TABLE IF EXISTS companies CASCADE;
 DROP TABLE IF EXISTS personal_users CASCADE;

db/migrations/20250618101030_functions_triggers.sql

@@ -98,9 +98,6 @@ CREATE TRIGGER trigger_companies_updated_at BEFORE UPDATE ON companies
 CREATE TRIGGER trigger_company_users_updated_at BEFORE UPDATE ON company_users 
     FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
 
-CREATE TRIGGER trigger_company_staff_profiles_updated_at BEFORE UPDATE ON company_staff_profiles 
-    FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
-
 CREATE TRIGGER trigger_company_employees_updated_at BEFORE UPDATE ON company_employees 
     FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
 
@@ -230,7 +227,6 @@ DROP TRIGGER IF EXISTS trigger_kyc_country_requirements_updated_at ON kyc_countr
 DROP TRIGGER IF EXISTS trigger_supported_countries_updated_at ON supported_countries;
 DROP TRIGGER IF EXISTS trigger_user_devices_updated_at ON user_devices;
 DROP TRIGGER IF EXISTS trigger_company_employees_updated_at ON company_employees;
-DROP TRIGGER IF EXISTS trigger_company_staff_profiles_updated_at ON company_staff_profiles;
 DROP TRIGGER IF EXISTS trigger_company_users_updated_at ON company_users;
 DROP TRIGGER IF EXISTS trigger_companies_updated_at ON companies;
 DROP TRIGGER IF EXISTS trigger_personal_users_updated_at ON personal_users;

db/query/companies.sql

@@ -111,173 +111,4 @@ UPDATE companies SET
   legal_entity_type = COALESCE(@legal_entity_type, legal_entity_type),
   updated_at = NOW()
 WHERE id = @id
-RETURNING *;
-
--- name: CreateCompanyUser :one
-INSERT INTO company_users (
-  id,
-  company_id,
-  user_id,
-  role,
-  department,
-  job_title,
-  is_administrator,
-  can_manage_payroll,
-  can_manage_invoices,
-  can_manage_employees,
-  can_manage_company_settings,
-  can_manage_bank_accounts,
-  can_manage_wallets,
-  permissions,
-  is_active,
-  added_by,
-  created_at,
-  updated_at
-) VALUES (
-  COALESCE(@id, uuid_generate_v4()),
-  @company_id,
-  @user_id,
-  @role,
-  @department,
-  @job_title,
-  COALESCE(@is_administrator, FALSE),
-  COALESCE(@can_manage_payroll, FALSE),
-  COALESCE(@can_manage_invoices, FALSE),
-  COALESCE(@can_manage_employees, FALSE),
-  COALESCE(@can_manage_company_settings, FALSE),
-  COALESCE(@can_manage_bank_accounts, FALSE),
-  COALESCE(@can_manage_wallets, FALSE),
-  @permissions,
-  COALESCE(@is_active, TRUE),
-  @added_by,
-  COALESCE(@created_at, NOW()),
-  COALESCE(@updated_at, NOW())
-) RETURNING *;
-
--- name: GetCompanyUser :one
-SELECT cu.*, u.email, u.account_status,
-       COALESCE(csp.first_name, pu.first_name) as first_name,
-       COALESCE(csp.last_name, pu.last_name) as last_name
-FROM company_users cu
-JOIN users u ON cu.user_id = u.id
-LEFT JOIN company_staff_profiles csp ON cu.id = csp.id
-LEFT JOIN personal_users pu ON u.id = pu.id
-WHERE cu.company_id = @company_id AND cu.user_id = @user_id;
-
--- name: GetCompanyUsersByCompany :many
-SELECT cu.*, u.email, u.account_status,
-       COALESCE(csp.first_name, pu.first_name) as first_name,
-       COALESCE(csp.last_name, pu.last_name) as last_name
-FROM company_users cu
-JOIN users u ON cu.user_id = u.id
-LEFT JOIN company_staff_profiles csp ON cu.id = csp.id
-LEFT JOIN personal_users pu ON u.id = pu.id
-WHERE cu.company_id = @company_id AND cu.is_active = TRUE
-ORDER BY cu.created_at DESC;
-
--- name: UpdateCompanyUser :one
-UPDATE company_users SET
-  role = COALESCE(@role, role),
-  department = COALESCE(@department, department),
-  job_title = COALESCE(@job_title, job_title),
-  is_administrator = COALESCE(@is_administrator, is_administrator),
-  can_manage_payroll = COALESCE(@can_manage_payroll, can_manage_payroll),
-  can_manage_invoices = COALESCE(@can_manage_invoices, can_manage_invoices),
-  can_manage_employees = COALESCE(@can_manage_employees, can_manage_employees),
-  can_manage_company_settings = COALESCE(@can_manage_company_settings, can_manage_company_settings),
-  can_manage_bank_accounts = COALESCE(@can_manage_bank_accounts, can_manage_bank_accounts),
-  can_manage_wallets = COALESCE(@can_manage_wallets, can_manage_wallets),
-  permissions = COALESCE(@permissions, permissions),
-  is_active = COALESCE(@is_active, is_active),
-  updated_at = NOW()
-WHERE company_id = @company_id AND user_id = @user_id
-RETURNING *;
-
--- name: CreateCompanyEmployee :one
-INSERT INTO company_employees (
-  id,
-  company_id,
-  user_id,
-  employee_id,
-  department,
-  position,
-  employment_status,
-  employment_type,
-  start_date,
-  end_date,
-  manager_id,
-  salary_amount,
-  salary_currency,
-  salary_frequency,
-  hourly_rate,
-  payment_method,
-  payment_split,
-  tax_information,
-  created_at,
-  updated_at
-) VALUES (
-  COALESCE(@id, uuid_generate_v4()),
-  @company_id,
-  @user_id,
-  @employee_id,
-  @department,
-  @position,
-  COALESCE(@employment_status, 'active'),
-  @employment_type,
-  @start_date,
-  @end_date,
-  @manager_id,
-  @salary_amount,
-  @salary_currency,
-  @salary_frequency,
-  @hourly_rate,
-  @payment_method,
-  @payment_split,
-  @tax_information,
-  COALESCE(@created_at, NOW()),
-  COALESCE(@updated_at, NOW())
-) RETURNING *;
-
--- name: GetCompanyEmployeeByID :one
-SELECT ce.*, 
-       u.email,
-       COALESCE(csp.first_name, pu.first_name) as first_name,
-       COALESCE(csp.last_name, pu.last_name) as last_name
-FROM company_employees ce
-LEFT JOIN users u ON ce.user_id = u.id
-LEFT JOIN company_staff_profiles csp ON ce.user_id = csp.id
-LEFT JOIN personal_users pu ON u.id = pu.id
-WHERE ce.id = @id;
-
--- name: GetCompanyEmployeesByCompany :many
-SELECT ce.*, 
-       u.email,
-       COALESCE(csp.first_name, pu.first_name) as first_name,
-       COALESCE(csp.last_name, pu.last_name) as last_name
-FROM company_employees ce
-LEFT JOIN users u ON ce.user_id = u.id
-LEFT JOIN company_staff_profiles csp ON ce.user_id = csp.id
-LEFT JOIN personal_users pu ON u.id = pu.id
-WHERE ce.company_id = @company_id
-ORDER BY ce.created_at DESC;
-
--- name: UpdateCompanyEmployee :one
-UPDATE company_employees SET
-  employee_id = COALESCE(@employee_id, employee_id),
-  department = COALESCE(@department, department),
-  position = COALESCE(@position, position),
-  employment_status = COALESCE(@employment_status, employment_status),
-  employment_type = COALESCE(@employment_type, employment_type),
-  start_date = COALESCE(@start_date, start_date),
-  end_date = COALESCE(@end_date, end_date),
-  manager_id = COALESCE(@manager_id, manager_id),
-  salary_amount = COALESCE(@salary_amount, salary_amount),
-  salary_currency = COALESCE(@salary_currency, salary_currency),
-  salary_frequency = COALESCE(@salary_frequency, salary_frequency),
-  hourly_rate = COALESCE(@hourly_rate, hourly_rate),
-  payment_method = COALESCE(@payment_method, payment_method),
-  payment_split = COALESCE(@payment_split, payment_split),
-  tax_information = COALESCE(@tax_information, tax_information),
-  updated_at = NOW()
-WHERE id = @id
 RETURNING *;