Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Fix: base_salary type in jobs" #603

Merged
merged 1 commit into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jobs/jobs.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type Career struct {
ButtonName string `json:"button_name"`
Qualification string `json:"qualification"`
EmploymentType string `json:"employment_type"`
BaseSalary string `json:"base_salary"`
BaseSalary int `json:"base_salary"`
Experience string `json:"experience"`
IsActive bool `json:"is_active"`
Skills null.String `json:"skills"`
Expand Down
2 changes: 1 addition & 1 deletion jobs/jobs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func expectedJobsData() map[string]interface{} {
jobs["button_name"] = "Apply"
jobs["qualification"] = "B.E/B.Tech/BCA/MCA/MSc IT degree in Computer Science, Engineering, or a related subject "
jobs["employment_type"] = "full_time"
jobs["base_salary"] = "15000"
jobs["base_salary"] = 15000.0
jobs["experience"] = "0-3 years"
jobs["is_active"] = true
jobs["skills"] = ""
Expand Down
2 changes: 1 addition & 1 deletion nuxt-frontend/pages/jobs/[id].vue
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ function getJsonLdSchema() {
currency: "INR",
value: {
"@type": "QuantitativeValue",
minValue: career?.base_salary || "10000",
minValue: parseInt(career?.base_salary || "10000"),
maxValue: 50000,
unitText: "MONTH",
},
Expand Down
5 changes: 3 additions & 2 deletions utils/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func TestDB() (*sqlx.DB, error) {

func CreateTables(db *sqlx.DB) error {

jobs := "CREATE TABLE IF NOT EXISTS jobs (id SERIAL PRIMARY KEY, title varchar, summary text, description text, button_name varchar, qualification varchar, employment_type varchar, base_salary varchar, experience varchar, is_active bool DEFAULT false, created_at timestamptz DEFAULT CURRENT_TIMESTAMP, updated_at timestamptz DEFAULT CURRENT_TIMESTAMP, skills text, total_openings int4 DEFAULT 1, responsibilities text, icon_name int4, unique_id varchar NOT NULL, seo_title varchar, seo_description text, apply_seo_title varchar, apply_seo_description text, index int4 NOT NULL DEFAULT 0)"
jobs := "CREATE TABLE IF NOT EXISTS jobs (id SERIAL PRIMARY KEY, title varchar, summary text, description text, button_name varchar, qualification varchar, employment_type varchar, base_salary int4, experience varchar, is_active bool DEFAULT false, created_at timestamptz DEFAULT CURRENT_TIMESTAMP, updated_at timestamptz DEFAULT CURRENT_TIMESTAMP, skills text, total_openings int4 DEFAULT 1, responsibilities text, icon_name int4, unique_id varchar NOT NULL, seo_title varchar, seo_description text, apply_seo_title varchar, apply_seo_description text, index int4 NOT NULL DEFAULT 0)"

_, err := db.Exec(jobs)

Expand Down Expand Up @@ -108,6 +108,7 @@ func CreateTables(db *sqlx.DB) error {

_, err = db.Exec(jobsIcons)


lifeatCanopas := "CREATE TABLE lifeatcanopas (id SERIAL PRIMARY KEY, image_urls varchar, index int4 NOT NULL DEFAULT 0, created_at timestamptz DEFAULT CURRENT_TIMESTAMP,updated_at timestamptz DEFAULT CURRENT_TIMESTAMP)"

_, err = db.Exec(lifeatCanopas)
Expand Down Expand Up @@ -141,7 +142,7 @@ func PrepareTablesData(db *sqlx.DB) {
db.MustExec("INSERT INTO job_applications(id, name, email, phone, place,reference, resumeURL, position, message, status, created_at, updated_at) VALUES(1, 'New Web Developer', '[email protected]', '1234567890', 'surat', 'From canopas', '', 'Web Developer from testing', 'I m a very good programer', '1',current_timestamp, current_timestamp)")
db.MustExec("INSERT INTO job_applicant_statuses(id, applicant_id, status, index, rejection_with_mail, created_at, updated_at) VALUES(1, 1, 1, 0, false, current_timestamp,current_timestamp )")
db.MustExec("INSERT INTO job_icons (id,name,value,createdAt,updatedAt) VALUES ('1','iOS','fab fa-apple',NULL,NULL);")
db.MustExec("INSERT INTO lifeatcanopas (id,image_urls,created_at,updated_at) VALUES(1,'https://canopas-website.s3.ap-south-1.amazonaws.com/lifeCanopas/1-400.webp,https://canopas-website.s3.ap-south-1.amazonaws.com/lifeCanopas/1-800.webp,https://canopas-website.s3.ap-south-1.amazonaws.com/lifeCanopas/1-1600.webp',current_timestamp, current_timestamp)")
db.MustExec("INSERT INTO lifeatcanopas (id,image_urls,created_at,updated_at) VALUES(1,'https://canopas-website.s3.ap-south-1.amazonaws.com/lifeCanopas/1-400.webp,https://canopas-website.s3.ap-south-1.amazonaws.com/lifeCanopas/1-800.webp,https://canopas-website.s3.ap-south-1.amazonaws.com/lifeCanopas/1-1600.webp',current_timestamp, current_timestamp)")
db.MustExec("INSERT INTO perks (id,image_urls,created_at,updated_at) VALUES(1,'https://canopas-website.s3.ap-south-1.amazonaws.com/lifeCanopas/1-400.webp,https://canopas-website.s3.ap-south-1.amazonaws.com/lifeCanopas/1-800.webp',current_timestamp, current_timestamp)")
}

Expand Down
Loading