From f0159908794c0cd25f64bf550bbed6c114e04566 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 18 Feb 2020 16:38:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9A=84=E8=AF=BE?=
 =?UTF-8?q?=E5=A0=82=E6=96=B0=E5=A2=9E=E5=92=8C=E7=BC=96=E8=BE=91=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/weapps/courses_controller.rb | 2 +-
 app/services/weapps/create_course_service.rb | 3 +++
 app/services/weapps/update_course_service.rb | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/weapps/courses_controller.rb b/app/controllers/weapps/courses_controller.rb
index 97e9884b8..48e161eaf 100644
--- a/app/controllers/weapps/courses_controller.rb
+++ b/app/controllers/weapps/courses_controller.rb
@@ -201,7 +201,7 @@ class Weapps::CoursesController < Weapps::BaseController
   private
 
   def course_params
-    params.permit(:name, :course_list_name, :credit, course_module_types: [])
+    params.permit(:name, :course_list_name, :credit, :end_date, course_module_types: [])
   end
 
   def update_course_params
diff --git a/app/services/weapps/create_course_service.rb b/app/services/weapps/create_course_service.rb
index 196533bb6..2e5cc5d2f 100644
--- a/app/services/weapps/create_course_service.rb
+++ b/app/services/weapps/create_course_service.rb
@@ -14,6 +14,7 @@ class Weapps::CreateCourseService < ApplicationService
       course.school_id = course.teacher&.school_id
       course.is_public = 0
       course.credit = params[:credit].blank? ? nil : params[:credit]
+      course.end_date = params[:end_date].blank? ? nil : params[:end_date]
       course_list = CourseList.find_by(name: params[:course_list_name].to_s.strip)
       if course_list
         course.course_list_id = course_list.id
@@ -21,6 +22,8 @@ class Weapps::CreateCourseService < ApplicationService
         new_course_list = CourseList.create!(name: params[:course_list_name].to_s.strip, user_id: course.tea_id, is_admin: 0)
         course.course_list_id = new_course_list.id
       end
+      course.is_end = course.end_date.present? && course.end_date < Date.today
+
       course.save!
 
       course.generate_invite_code
diff --git a/app/services/weapps/update_course_service.rb b/app/services/weapps/update_course_service.rb
index 0395a53ad..b6663bc73 100644
--- a/app/services/weapps/update_course_service.rb
+++ b/app/services/weapps/update_course_service.rb
@@ -12,6 +12,7 @@ class Weapps::UpdateCourseService < ApplicationService
     ActiveRecord::Base.transaction do
       course.name = params[:name].to_s.strip
       course.credit = params[:credit].blank? ? nil : params[:credit]
+      course.end_date = params[:end_date].blank? ? nil : params[:end_date]
       course_list = CourseList.find_by(name: params[:course_list_name].to_s.strip)
       if course_list
         course.course_list_id = course_list.id
@@ -19,6 +20,7 @@ class Weapps::UpdateCourseService < ApplicationService
         new_course_list = CourseList.create!(name: params[:course_list_name].to_s.strip, user_id: course.tea_id, is_admin: 0)
         course.course_list_id = new_course_list.id
       end
+      course.is_end = course.end_date.present? && course.end_date < Date.today
       course.save!
     end
     course