Merge pull request #175 from AkshatGupta15/main

Refactor proforma query to include additional fields and Fixed Issue #145
spo-iitk · Oct 5, 2024 · b00ea68 · b00ea68
2 parents 456bbba + ed1e722
commit b00ea68
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/application/db.proforma.go b/application/db.proforma.go
@@ -180,6 +180,17 @@ func fetchProformaForStudent(ctx *gin.Context, pid uint, jp *Proforma) error {
 			"perks",
 			"package_details",
 			"bond_details",
+
+			"base",
+			"gross",
+			"joining_bonus",
+			"take_home",
+			"relocation_bonus",
+			"retention_bonus",
+			"package_details",
+			"bond_details",
+			"first_ctc",
+			"deductions",
 		).
 		First(jp)
 	return tx.Error

diff --git a/rc/db.rc.go b/rc/db.rc.go
@@ -5,7 +5,7 @@ import (
 )
 
 func fetchAllRCs(ctx *gin.Context, rc *[]RecruitmentCycle) error {
-	tx := db.WithContext(ctx).Find(rc)
+	tx := db.WithContext(ctx).Order("is_active DESC").Find(rc)
 	return tx.Error
 }