Remove Current position from Portfolio (#983)

* Remove Current position from Portfolio

* Linting

Author: pollygee

app/controllers/classrooms_controller.rb

@@ -100,7 +100,9 @@ def calculate_classroom_stats
     {
       total_students: students.count,
       active_students: students.joins(:orders).distinct.count,
-      total_portfolio_value: students.joins(:portfolio).sum("portfolios.current_position"),
+      total_portfolio_value: students.includes(:portfolio).sum do |student|
+        student.portfolio&.calculate_total_value || 0
+      end,
       recent_orders_count: Order.joins(:user).where(users: { classroom: @classroom }).where("orders.created_at > ?",
                                                                                             1.week.ago).count
     }

app/dashboards/portfolio_dashboard.rb

@@ -12,7 +12,7 @@ class PortfolioDashboard < Administrate::BaseDashboard
   ATTRIBUTE_TYPES = {
     id: Field::Number,
     cash_balance: Field::Number.with_options(decimals: 2),
-    current_position: Field::Number.with_options(decimals: 2),
+    total_portfolio_worth: Field::Number.with_options(decimals: 2),
     portfolio_stocks: Field::HasMany,
     portfolio_transactions: Field::HasMany,
     user: Field::BelongsTo,
@@ -28,7 +28,7 @@ class PortfolioDashboard < Administrate::BaseDashboard
   COLLECTION_ATTRIBUTES = %i[
     id
     cash_balance
-    current_position
+    total_portfolio_worth
     portfolio_stocks
   ].freeze
 
@@ -37,7 +37,7 @@ class PortfolioDashboard < Administrate::BaseDashboard
   SHOW_PAGE_ATTRIBUTES = %i[
     id
     cash_balance
-    current_position
+    total_portfolio_worth
     portfolio_stocks
     portfolio_transactions
   ].freeze
@@ -46,7 +46,6 @@ class PortfolioDashboard < Administrate::BaseDashboard
   # an array of attributes that will be displayed
   # on the model's form (`new` and `edit`) pages.
   FORM_ATTRIBUTES = %i[
-    current_position
     portfolio_stocks
     portfolio_transactions
   ].freeze

app/models/portfolio.rb

@@ -37,6 +37,10 @@ def calculate_total_value
     calculate_total_value_cents / 100.0
   end
 
+  def total_portfolio_worth
+    calculate_total_value
+  end
+
   def holdings_value
     holdings_value_cents / 100.0
   end

app/models/student.rb

@@ -76,7 +76,7 @@ def set_default_email
   end
 
   def ensure_portfolio
-    create_portfolio!(current_position: 0) if portfolio.blank?
+    create_portfolio! if portfolio.blank?
   end
 
   def create_initial_enrollment

app/views/classrooms/index.html.erb

@@ -67,7 +67,7 @@
               </td>
               <td class="table-body-cell table-body-cell-right">
                 <span class="table-cell-content">
-                  $<%= number_with_precision(classroom.students.sum { |s| s.portfolio&.current_position || 0 }, precision: 2) %>
+                  $<%= number_with_precision(classroom.students.sum { |s| s.portfolio&.calculate_total_value || 0 }, precision: 2) %>
                 </span>
               </td>
               <td class="table-body-cell table-body-cell-center">

db/migrate/20260102204736_remove_current_position_from_portfolios.rb

@@ -0,0 +1,5 @@
+class RemoveCurrentPositionFromPortfolios < ActiveRecord::Migration[8.1]
+  def change
+    safety_assured { remove_column :portfolios, :current_position, :float }
+  end
+end

db/schema.rb

@@ -64,7 +64,7 @@ class StudentsControllerTest < ActionDispatch::IntegrationTest
 
     student = Student.last
     assert_not_nil student.portfolio
-    assert_equal 0, student.portfolio.current_position
+    assert_equal 0, student.portfolio.calculate_total_value
   end
 
   test "student creation generates memorable password" do