show view restricted future/completed enrollments as completed

test plan:
* enroll a student in a course with
 "Restrict students from viewing after end date" enabled
* set the term dates to the past
* on the account user details page for the student
 (e.g. "/users/X") it should not say that the enrollment
 is "Inactive", but rather "Completed"

* repeat for a future course (it should say "Pending")

closes #CNVS-27436

Change-Id: I4b774267cb5e6418ef76b6ed93fe2e6bcc686fd1
Reviewed-on: https://gerrit.instructure.com/73623
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Allison Weiss <allison@instructure.com>

Author: maneframe

app/models/enrollment.rb

@@ -677,17 +677,37 @@ def calculated_state_based_on_date
       self.restrict_past_view? ? :inactive : :completed
     elsif self.fake_student? # Allow student view students to use the course before the term starts
       state
-    elsif view_restrictable? && !self.restrict_future_view?
+    else
       self.available_at = global_start_at
-      if state == :active
-        # an accepted enrollment state means they still can't participate yet,
-        # but should be able to view just like an invited enrollment
-        :accepted
+      if view_restrictable? && !self.restrict_future_view?
+        if state == :active
+          # an accepted enrollment state means they still can't participate yet,
+          # but should be able to view just like an invited enrollment
+          :accepted
+        else
+          state
+        end
       else
-        state
+        :inactive
       end
+    end
+  end
+
+  def readable_state_based_on_date
+    # when view restrictions are in place, the effective state_based_on_date is :inactive, but
+    # to admins we should show that they are :completed or :pending
+
+    if state == :completed || ([:invited, :active].include?(state) && self.course.completed?)
+      :completed
     else
-      :inactive
+      date_state = state_based_on_date
+      if self.available_at
+        :pending
+      elsif self.soft_completed_at
+        :completed
+      else
+        date_state
+      end
     end
   end
 
@@ -857,10 +877,6 @@ def self.workflow_readable_type(state)
     end
   end
 
-  def workflow_readable_type
-    Enrollment.workflow_readable_type(self.workflow_state)
-  end
-
   def readable_role_name
     self.role.built_in? ? self.readable_type : self.role.name
   end

app/views/users/_enrollment.html.erb

@@ -13,7 +13,7 @@
     <% end %>
 
     <span class="subtitle ellipsis">
-      <%= Enrollment.workflow_readable_type(enrollment.state_based_on_date) %>,
+      <%= Enrollment.workflow_readable_type(enrollment.readable_state_based_on_date) %>,
       <%=
         case enrollment.class.to_s
         when 'TeacherEnrollment'

spec/integration/enrollment_date_restrictions_spec.rb

@@ -132,7 +132,6 @@
     Account.default.account_users.create!(user: @user)
     @user.reload
     get "/users/#{@user.id}"
-    expect(response.body).to match /Inactive/
     expect(response.body).to match /Completed/
     expect(response.body).to match /Active/
   end

spec/models/enrollment_spec.rb

@@ -2002,4 +2002,55 @@ def enrollment_dates_override_test
       expect(Enrollment.not_yet_started(@course)).not_to include(@enrollment)
     end
   end
+
+  describe "readable_state_based_on_date" do
+    before :once do
+      course(:active_all => true)
+      @enrollment = @course.enroll_student(user)
+      @enrollment.accept!
+    end
+
+    it "should return pending for future enrollments (even if view restricted)" do
+      @course.start_at = 1.month.from_now
+      @course.restrict_student_future_view = true
+      @course.restrict_enrollments_to_course_dates = true
+      @course.save!
+
+      @enrollment.reload
+      expect(@enrollment.state_based_on_date).to eq :inactive
+      expect(@enrollment.readable_state_based_on_date).to eq :pending
+
+      @course.restrict_student_future_view = false
+      @course.save!
+
+      @enrollment = Enrollment.find(@enrollment.id)
+      expect(@enrollment.state_based_on_date).to eq :accepted
+      expect(@enrollment.readable_state_based_on_date).to eq :pending
+    end
+
+    it "should return completed for completed enrollments (even if view restricted)" do
+      @course.start_at = 2.months.ago
+      @course.conclude_at = 1.month.ago
+      @course.restrict_student_past_view = true
+      @course.restrict_enrollments_to_course_dates = true
+      @course.save!
+
+      @enrollment.reload
+      expect(@enrollment.state_based_on_date).to eq :inactive
+      expect(@enrollment.readable_state_based_on_date).to eq :completed
+
+      @course.complete!
+
+      @enrollment = Enrollment.find(@enrollment.id)
+      expect(@enrollment.state_based_on_date).to eq :inactive
+      expect(@enrollment.readable_state_based_on_date).to eq :completed
+
+      @course.restrict_student_past_view = false
+      @course.save!
+
+      @enrollment = Enrollment.find(@enrollment.id)
+      expect(@enrollment.state_based_on_date).to eq :completed
+      expect(@enrollment.readable_state_based_on_date).to eq :completed
+    end
+  end
 end