Merge pull request #257 from avantifellows/feat/remove-grade-id-from-ER

Feat: Removed grade_id from enrollment record
avantifellows · Jan 24, 2025 · b6b7574 · b6b7574
2 parents 9947bf6 + e8d2bec
commit b6b7574
Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/lib/dbservice/enrollment_record/enrollment_record.ex b/lib/dbservice/enrollment_record/enrollment_record.ex
@@ -6,7 +6,6 @@ defmodule Dbservice.EnrollmentRecords.EnrollmentRecord do
   import Dbservice.Utils.Util
 
   alias Dbservice.Users.User
-  alias Dbservice.Grades.Grade
   alias Dbservice.Subjects.Subject
 
   schema "enrollment_record" do
@@ -17,7 +16,6 @@ defmodule Dbservice.EnrollmentRecords.EnrollmentRecord do
     field :group_id, :integer
     field :group_type, :string
 
-    belongs_to(:grade, Grade)
     belongs_to(:subject, Subject)
 
     belongs_to(:user, User)
@@ -47,7 +45,6 @@ defmodule Dbservice.EnrollmentRecords.EnrollmentRecord do
       :academic_year,
       :group_id,
       :group_type,
-      :grade_id,
       :subject_id
     ])
     |> validate_required(required_fields)

diff --git a/lib/dbservice/enrollment_records.ex b/lib/dbservice/enrollment_records.ex
@@ -69,14 +69,12 @@ defmodule Dbservice.EnrollmentRecords do
         user_id,
         group_id,
         group_type,
-        grade_id,
         academic_year
       ) do
     Repo.get_by(EnrollmentRecord,
       user_id: user_id,
       group_id: group_id,
       group_type: group_type,
-      grade_id: grade_id,
       academic_year: academic_year
     )
   end

diff --git a/lib/dbservice_web/controllers/enrollment_record_controller.ex b/lib/dbservice_web/controllers/enrollment_record_controller.ex
@@ -78,7 +78,6 @@ defmodule DbserviceWeb.EnrollmentRecordController do
            params["user_id"],
            params["group_id"],
            params["group_type"],
-           params["grade_id"],
            params["academic_year"]
          ) do
       nil ->

diff --git a/lib/dbservice_web/controllers/group_user_controller.ex b/lib/dbservice_web/controllers/group_user_controller.ex
@@ -238,7 +238,6 @@ defmodule DbserviceWeb.GroupUserController do
       "group_id" => group.child_id,
       "group_type" => group.type,
       "user_id" => params["user_id"],
-      "grade_id" => params["grade_id"],
       "academic_year" => academic_year,
       "start_date" => params["start_date"]
     }

diff --git a/lib/dbservice_web/swagger_schemas/enrollment_record.ex b/lib/dbservice_web/swagger_schemas/enrollment_record.ex
@@ -11,7 +11,6 @@ defmodule DbserviceWeb.SwaggerSchema.EnrollmentRecord do
           description("An enrollment record for the student")
 
           properties do
-            grade(:string, "Grade")
             academic_year(:string, "Academic Year")
             is_current(:boolean, "Is current enrollment record for student")
             student_id(:integer, "Student ID that the program enrollment belongs to")
@@ -22,7 +21,6 @@ defmodule DbserviceWeb.SwaggerSchema.EnrollmentRecord do
           end
 
           example(%{
-            grade: "7",
             academic_year: "2022",
             is_current: true,
             student_id: 1,

diff --git a/lib/dbservice_web/views/enrollment_record_view.ex b/lib/dbservice_web/views/enrollment_record_view.ex
@@ -20,7 +20,6 @@ defmodule DbserviceWeb.EnrollmentRecordView do
       group_id: enrollment_record.group_id,
       group_type: enrollment_record.group_type,
       user_id: enrollment_record.user_id,
-      grade_id: enrollment_record.grade_id,
       subject_id: enrollment_record.subject_id
     }
   end

diff --git a/priv/repo/migrations/20250123110317_remove_grade_id_from_grade.exs b/priv/repo/migrations/20250123110317_remove_grade_id_from_grade.exs
@@ -0,0 +1,9 @@
+defmodule Dbservice.Repo.Migrations.RemoveGradeIdFromGrade do
+  use Ecto.Migration
+
+  def change do
+    alter table(:enrollment_record) do
+      remove :grade_id
+    end
+  end
+end