From 1fdab9192df7792a8537fb6986064659478ffdbf Mon Sep 17 00:00:00 2001 From: Samuel Tariku Date: Mon, 28 Apr 2025 20:45:34 +0300 Subject: [PATCH] fix issues for deploying --- db/migrations/000003_referal.up.sql | 25 ++++++++-------------- internal/web_server/cron.go | 32 ++++++++++++++--------------- 2 files changed, 25 insertions(+), 32 deletions(-) diff --git a/db/migrations/000003_referal.up.sql b/db/migrations/000003_referal.up.sql index 4f8a181..12a8c2d 100644 --- a/db/migrations/000003_referal.up.sql +++ b/db/migrations/000003_referal.up.sql @@ -1,5 +1,4 @@ CREATE TYPE ReferralStatus AS ENUM ('PENDING', 'COMPLETED', 'EXPIRED', 'CANCELLED'); - CREATE TABLE IF NOT EXISTS referral_settings ( id BIGSERIAL PRIMARY KEY, referral_reward_amount DECIMAL(15, 2) NOT NULL DEFAULT 0.00, @@ -17,37 +16,31 @@ CREATE TABLE IF NOT EXISTS referral_settings ( AND cashback_percentage <= 100 ) ); - CREATE TABLE IF NOT EXISTS referrals ( id BIGSERIAL PRIMARY KEY, referral_code VARCHAR(10) NOT NULL UNIQUE, - referrer_id VARCHAR(255) NOT NULL, - referred_id VARCHAR(255) UNIQUE, + -- referrer_id VARCHAR(255) NOT NULL, + -- referred_id VARCHAR(255) UNIQUE, status ReferralStatus NOT NULL DEFAULT 'PENDING', reward_amount DECIMAL(15, 2) NOT NULL DEFAULT 0.00, cashback_amount DECIMAL(15, 2) NOT NULL DEFAULT 0.00, created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP, updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP, expires_at TIMESTAMPTZ NOT NULL, - FOREIGN KEY (referrer_id) REFERENCES users (id), - FOREIGN KEY (referred_id) REFERENCES users (id), + -- FOREIGN KEY (referrer_id) REFERENCES users (id), + -- FOREIGN KEY (referred_id) REFERENCES users (id), CONSTRAINT reward_amount_positive CHECK (reward_amount >= 0), CONSTRAINT cashback_amount_positive CHECK (cashback_amount >= 0) ); - CREATE INDEX idx_referrals_referral_code ON referrals (referral_code); - -CREATE INDEX idx_referrals_referrer_id ON referrals (referrer_id); - +-- CREATE INDEX idx_referrals_referrer_id ON referrals (referrer_id); CREATE INDEX idx_referrals_status ON referrals (status); - ALTER TABLE users ADD COLUMN IF NOT EXISTS referral_code VARCHAR(10) UNIQUE, -ADD COLUMN IF NOT EXISTS referred_by VARCHAR(10); - + ADD COLUMN IF NOT EXISTS referred_by VARCHAR(10); -- Modify wallet table to track bonus money separately ALTER TABLE wallets ADD COLUMN IF NOT EXISTS bonus_balance DECIMAL(15, 2) NOT NULL DEFAULT 0.00, -ADD COLUMN IF NOT EXISTS cash_balance DECIMAL(15, 2) NOT NULL DEFAULT 0.00, -ADD CONSTRAINT bonus_balance_positive CHECK (bonus_balance >= 0), -ADD CONSTRAINT cash_balance_positive CHECK (cash_balance >= 0); + ADD COLUMN IF NOT EXISTS cash_balance DECIMAL(15, 2) NOT NULL DEFAULT 0.00, + ADD CONSTRAINT bonus_balance_positive CHECK (bonus_balance >= 0), + ADD CONSTRAINT cash_balance_positive CHECK (cash_balance >= 0); \ No newline at end of file diff --git a/internal/web_server/cron.go b/internal/web_server/cron.go index 34a881c..dc7f2d4 100644 --- a/internal/web_server/cron.go +++ b/internal/web_server/cron.go @@ -17,14 +17,14 @@ func StartDataFetchingCrons(eventService eventsvc.Service, oddsService oddssvc.S spec string task func() }{ - // { - // spec: "*/5 * * * * *", // Every 5 seconds - // task: func() { - // if err := eventService.FetchUpcomingEvents(context.Background()); err != nil { - // log.Printf("FetchUpcomingEvents error: %v", err) - // } - // }, - // }, + { + spec: "0 0 * * * *",, // Every 1 hour + task: func() { + if err := eventService.FetchUpcomingEvents(context.Background()); err != nil { + log.Printf("FetchUpcomingEvents error: %v", err) + } + }, + }, // { // spec: "*/5 * * * * *", // Every 5 seconds @@ -34,14 +34,14 @@ func StartDataFetchingCrons(eventService eventsvc.Service, oddsService oddssvc.S // } // }, // }, - // { - // spec: "0 */15 * * * *", // Every 15 minutes - // task: func() { - // if err := oddsService.FetchNonLiveOdds(context.Background()); err != nil { - // log.Printf("FetchNonLiveOdds error: %v", err) - // } - // }, - // }, + { + spec: "0 */15 * * * *", // Every 15 minutes + task: func() { + if err := oddsService.FetchNonLiveOdds(context.Background()); err != nil { + log.Printf("FetchNonLiveOdds error: %v", err) + } + }, + }, { spec: "*/10 * * * * *", task: func() {