8-6 update (take course list sort)

parkground · Mar 3, 2022 · ebcdeed · ebcdeed
1 parent 78f85f1
commit ebcdeed
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 13 deletions.
diff --git a/src/main/java/com/zerobase/fastlms/course/controller/AdminTakeCourseController.java b/src/main/java/com/zerobase/fastlms/course/controller/AdminTakeCourseController.java
@@ -1,13 +1,16 @@
 package com.zerobase.fastlms.course.controller;
 
+import com.zerobase.fastlms.course.dto.CourseDto;
 import com.zerobase.fastlms.course.dto.TakeCourseDto;
 import com.zerobase.fastlms.course.model.ServiceResult;
 import com.zerobase.fastlms.course.model.TakeCourseParam;
+import com.zerobase.fastlms.course.service.CourseService;
 import com.zerobase.fastlms.course.service.TakeCourseService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.util.CollectionUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 
@@ -17,18 +20,20 @@
 @Controller
 public class AdminTakeCourseController extends BaseController {
 
+    private final CourseService courseService;
     private final TakeCourseService takeCourseService;
 
     @GetMapping("/admin/takecourse/list.do")
-    public String list(Model model, TakeCourseParam parameter) {
+    public String list(Model model, TakeCourseParam parameter
+            , BindingResult bindingResult) {
 
         parameter.init();
 
-        List<TakeCourseDto> courseList = takeCourseService.list(parameter);
+        List<TakeCourseDto> list = takeCourseService.list(parameter);
 
         long totalCount = 0;
-        if (!CollectionUtils.isEmpty(courseList)) {
-            totalCount = courseList.get(0).getTotalCount();
+        if (!CollectionUtils.isEmpty(list)) {
+            totalCount = list.get(0).getTotalCount();
         }
         String queryString = parameter.getQueryString();
         String pagerHtml =
@@ -37,10 +42,13 @@ public String list(Model model, TakeCourseParam parameter) {
                         parameter.getPageIndex(),
                         queryString);
 
-        model.addAttribute("list", courseList);
+        model.addAttribute("list", list);
         model.addAttribute("totalCount", totalCount);
         model.addAttribute("pager", pagerHtml);
 
+        List<CourseDto> courseList = courseService.listAll();
+        model.addAttribute("courseList", courseList);
+
         return "admin/takecourse/list";
     }
 

diff --git a/src/main/java/com/zerobase/fastlms/course/model/TakeCourseParam.java b/src/main/java/com/zerobase/fastlms/course/model/TakeCourseParam.java
@@ -10,4 +10,6 @@ public class TakeCourseParam extends CommonParam {
     String status;
 
     String userId;
+
+    long searchCourseId;
 }
diff --git a/src/main/java/com/zerobase/fastlms/course/service/CourseService.java b/src/main/java/com/zerobase/fastlms/course/service/CourseService.java
@@ -49,4 +49,9 @@ public interface CourseService {
      * 프론트 - 수강 신청
      */
     ServiceResult req(TakeCourseInput parameter);
+
+    /**
+     * 전체 강좌 목록
+     */
+    List<CourseDto> listAll();
 }
diff --git a/src/main/java/com/zerobase/fastlms/course/service/impl/CourseServiceImpl.java b/src/main/java/com/zerobase/fastlms/course/service/impl/CourseServiceImpl.java
@@ -197,4 +197,12 @@ public ServiceResult req(TakeCourseInput parameter) {
         result.setMessage("");
         return result;
     }
+
+    @Override
+    public List<CourseDto> listAll() {
+
+        List<Course> courseList = courseRepository.findAll();
+
+        return CourseDto.of(courseList);
+    }
 }
diff --git a/src/main/resources/mybatis/TakeCourseMapper.xml b/src/main/resources/mybatis/TakeCourseMapper.xml
@@ -6,17 +6,22 @@
 
     <sql id="selectListWhere">
 
+        <if test="searchCourseId > 0">
+            and c.id = #{searchCourseId}
+        </if>
+
     </sql>
 
     <select id="selectListCount" resultType="long">
         select count(*)
-        from take_course
+        from take_course tc
+            join course c on tc.course_id = c.id
+            join member m on tc.user_id = m.user_id
         where 1 = 1
-            <include refid="selectListWhere"/>
+        <include refid="selectListWhere"/>
     </select>
 
     <select id="selectList" resultType="com.zerobase.fastlms.course.dto.TakeCourseDto">
-
         select tc.*
             , c.subject
             , m.user_name
@@ -25,7 +30,7 @@
             join course c on tc.course_id = c.id
             join member m on tc.user_id = m.user_id
         where 1 = 1
-            <include refid="selectListWhere"/>
+        <include refid="selectListWhere"/>
         order by reg_dt desc
 
         limit #{pageStart}, #{pageEnd}

diff --git a/src/main/resources/templates/admin/takecourse/list.html b/src/main/resources/templates/admin/takecourse/list.html
@@ -62,6 +62,13 @@
     <script>
         $(document).ready(function () {
 
+            $('#searchCourseId').on('change', function () {
+
+                var id = $(this).val();
+
+                location.href = '?searchCourseId=' + id;
+            });
+
             $('.row-buttons button').on('click', function () {
 
                 var status = $(this).val();
@@ -86,6 +93,13 @@ <h1>수강 관리</h1>
 
 <div class="list">
     <div class="buttons">
+
+        <select id="searchCourseId">
+            <option value="">전체 강좌</option>
+            <option th:each="x : ${courseList}"
+                    th:selected="${#strings.equals(param.searchCourseId, x.id)}"
+                    th:value="${x.id}" th:text="${x.subject}">강좌명</option>
+        </select>
         <p class="total-count">전체 <span th:text="${totalCount}"></span>개</p>
     </div>
     <table>
@@ -130,9 +144,14 @@ <h1>수강 관리</h1>
                 </div>
             </td>
         </tr>
+        <tr th:if="${#lists.size(list) < 1}">
+            <td colspan="8">
+                <p class="nothing">내용이 없습니다.</p>
+            </td>
+        </tr>
         </tbody>
     </table>
-    <div class="pager" th:utext="${pager}">
+    <div class="pager" th:if="${#lists.size(list) > 0}" th:utext="${pager}">
     </div>
 </div>
 
@@ -141,6 +160,4 @@ <h1>수강 관리</h1>
     <input type="hidden" name="status"/>
 </form>
 </body>
-</html>
-
-
+</html>