Merge pull request #12 from BCSDLab/release/1.2.0

Release/1.2.0

Author: knight7024

src/main/java/koreatech/in/controller/CalendarController.java

@@ -21,7 +21,13 @@ public class CalendarController {
 
     @RequestMapping(value = "/calendars", method = RequestMethod.GET)
     public @ResponseBody
-    ResponseEntity getCalendars(@ApiParam(required = true) @RequestParam(value = "year") String year) {
-        return new ResponseEntity<List<Calendar>>(calendarService.getCalendars(year), HttpStatus.OK);
+    ResponseEntity<List<Calendar>> getCalendars(@ApiParam(required = true) @RequestParam(value = "year") String year) {
+        return new ResponseEntity<>(calendarService.getCalendars(year), HttpStatus.OK);
+    }
+
+    @RequestMapping(value = "/term", method = RequestMethod.GET)
+    public @ResponseBody
+    ResponseEntity<String> getTerm() throws Exception {
+        return new ResponseEntity<>(calendarService.getTerm(), HttpStatus.OK);
     }
 }

src/main/java/koreatech/in/controller/TimeTableController.java

@@ -6,13 +6,15 @@
 import koreatech.in.annotation.Auth;
 import koreatech.in.annotation.AuthExcept;
 import koreatech.in.domain.TimeTable.Lecture;
+import koreatech.in.domain.TimeTable.Semester;
 import koreatech.in.service.TimeTableService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.inject.Inject;
+import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Map;
 
@@ -30,6 +32,13 @@ ResponseEntity getLectureList(@ApiParam(value = "학기 (예시:20191)", require
         return new ResponseEntity<ArrayList<Lecture>>(timeTableService.getLectureList(semester_date), HttpStatus.OK);
     }
 
+    @AuthExcept
+    @RequestMapping(value = "/semesters", method = RequestMethod.GET)
+    public @ResponseBody
+    ResponseEntity getSemesterList() throws Exception {
+        return new ResponseEntity<ArrayList<Semester>>(timeTableService.getSemesterList(), HttpStatus.OK);
+    }
+
     @ApiOperation(value = "", authorizations = {@Authorization(value="Authorization")})
     @RequestMapping(value = "/timetables", method = RequestMethod.GET)
     public @ResponseBody
@@ -66,4 +75,6 @@ ResponseEntity deleteTimeTableAll(@ApiParam(value = "학기 (예시:20191)", req
     ResponseEntity deleteTimeTableById(@ApiParam(value = "스케줄의 uid", required = true) @RequestParam(value = "id") int id) throws Exception {
         return new ResponseEntity<Map<String, Object>>(timeTableService.deleteTimeTableById(id), HttpStatus.OK);
     }
+
+
 }

src/main/java/koreatech/in/controller/admin/AdminCalendarController.java

@@ -0,0 +1,31 @@
+package koreatech.in.controller.admin;
+
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.Authorization;
+import koreatech.in.annotation.Auth;
+import koreatech.in.service.CalendarService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.inject.Inject;
+
+@Auth(role = Auth.Role.ADMIN, authority = Auth.Authority.COMMUNITY)
+@Controller
+public class AdminCalendarController {
+    @Inject
+    private CalendarService calendarService;
+
+    @ApiOperation(value = "", authorizations = {@Authorization(value="Authorization")})
+    @RequestMapping(value = "/admin/term", method = RequestMethod.POST)
+    public @ResponseBody
+    ResponseEntity<String> createTerm(@ApiParam(required = true, value = "10: 1학기 정규, 11: 1학기 계절, 20: 2학기 정규, 21: 2학기 계절") @RequestBody String term) {
+
+        return new ResponseEntity<>(calendarService.createTermForAdmin(term), HttpStatus.CREATED);
+    }
+}

src/main/java/koreatech/in/domain/TimeTable/Semester.java

@@ -0,0 +1,30 @@
+package koreatech.in.domain.TimeTable;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Arrays;
+import java.util.regex.Pattern;
+
+public class Semester {
+    @ApiModelProperty(notes = "id", example = "1")
+    private Integer id;
+
+    @ApiModelProperty(notes = "학기", example = "20192")
+    private String semester;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public String getSemester() {
+        return semester;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public void setSemester(String semester) {
+        this.semester = semester;
+    }
+}

src/main/java/koreatech/in/domain/User/User.java

@@ -31,7 +31,6 @@ public class User implements UserDetails {
     protected String student_number;
     @ApiModelProperty(notes = "기계공학부, 컴퓨터공학부, 메카트로닉스공학부, 전기전자통신공학부, 디자인건축공학부, 에너지신소재화학공학부, 산업경영학부", example = "컴퓨터공학부")
     protected String major;
-    @NotNull(groups = {ValidationGroups.CreateAdmin.class}, message = "신원은 비워둘 수 없습니다.")
     @ApiModelProperty(notes = "신원(0: 학생, 1: 대학원생, 2: 교수, 3: 교직원, 4: 졸업생, 5: 점주)", example = "0")
     protected Integer identity;
     @ApiModelProperty(notes = "졸업 여부", example = "false")

src/main/java/koreatech/in/repository/TimeTableMapper.java

@@ -1,11 +1,13 @@
 package koreatech.in.repository;
 
 import koreatech.in.domain.TimeTable.Lecture;
+import koreatech.in.domain.TimeTable.Semester;
 import koreatech.in.domain.TimeTable.TimeTable;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
 import java.util.ArrayList;
+import java.util.Map;
 
 @Repository("timeTableMapper")
 public interface TimeTableMapper {
@@ -48,4 +50,7 @@ public interface TimeTableMapper {
 
     @Select("SELECT id FROM koin.semester WHERE semester = #{semester}")
     Integer getSemesterId(@Param("semester") String semester);
+
+    @Select("SELECT * FROM koin.semester order by semester desc limit 10")
+    ArrayList<Semester> getSemesterList();
 }

src/main/java/koreatech/in/service/CalendarService.java

@@ -6,5 +6,9 @@
 import java.util.List;
 
 public interface CalendarService {
-    public List<Calendar> getCalendars(String year);
+    List<Calendar> getCalendars(String year);
+
+    String getTerm() throws Exception;
+
+    String createTermForAdmin(String term);
 }

src/main/java/koreatech/in/service/CalendarServiceImpl.java

@@ -2,23 +2,46 @@
 
 import koreatech.in.domain.ErrorMessage;
 import koreatech.in.domain.kut.Calendar;
+import koreatech.in.exception.NotFoundException;
 import koreatech.in.exception.PreconditionFailedException;
 import koreatech.in.repository.CalendarMapper;
+import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.inject.Inject;
 import java.util.List;
 
 @Service
-public class CalendarServiceImpl implements CalendarService{
+public class CalendarServiceImpl implements CalendarService {
     @Inject
     CalendarMapper calendarMapper;
 
+    @Resource(name = "redisTemplate")
+    private ValueOperations<String, String> valueOps;
+
     @Override
     public List<Calendar> getCalendars(String year) {
-        if(year == null) {
+        if (year == null) {
             throw new PreconditionFailedException(new ErrorMessage("year is required", 0));
         }
         return calendarMapper.getCalendarsByYear(year);
     }
+
+    @Override
+    public String getTerm() throws Exception {
+        String term = valueOps.get("termCode");
+
+        // 데이터 존재여부 확인
+        if(term == null) {
+            throw new NotFoundException(new ErrorMessage("저장된 학기 코드가 없습니다.", 0));
+        }
+        return term;
+    }
+
+    @Override
+    public String createTermForAdmin(String term) {
+        valueOps.set("termCode", term);
+        return term;
+    }
 }

src/main/java/koreatech/in/service/TimeTableService.java

@@ -1,6 +1,7 @@
 package koreatech.in.service;
 
 import koreatech.in.domain.TimeTable.Lecture;
+import koreatech.in.domain.TimeTable.Semester;
 import koreatech.in.domain.TimeTable.TimeTable;
 
 import java.util.ArrayList;
@@ -9,6 +10,8 @@
 public interface TimeTableService {
     ArrayList<Lecture> getLectureList(String semester_date) throws Exception;
 
+    ArrayList<Semester> getSemesterList() throws Exception;
+
     Map<String, Object> getTimeTables(String semester) throws Exception;
 
     Map<String, Object> createTimeTables(String timetable_log) throws Exception;
@@ -18,4 +21,5 @@ public interface TimeTableService {
     Map<String, Object> deleteTimeTableAll(String semester) throws Exception;
 
     Map<String, Object> deleteTimeTableById(int id) throws Exception;
+
 }

src/main/java/koreatech/in/service/TimeTableServiceImpl.java

@@ -4,6 +4,7 @@
 
 import koreatech.in.domain.ErrorMessage;
 import koreatech.in.domain.TimeTable.Lecture;
+import koreatech.in.domain.TimeTable.Semester;
 import koreatech.in.domain.TimeTable.TimeTable;
 import koreatech.in.domain.User.User;
 import koreatech.in.exception.*;
@@ -35,6 +36,11 @@ public ArrayList<Lecture> getLectureList(String semester_date) throws Exception
         return timeTableMapper.getLectureList(semester_date);
     }
 
+    @Override
+    public ArrayList<Semester> getSemesterList() throws Exception {
+        return timeTableMapper.getSemesterList();
+    }
+
     @Override
     public Map<String, Object> getTimeTables(String semester) throws Exception {
         User user = jwtValidator.validate();
@@ -224,4 +230,6 @@ public Map<String, Object> deleteTimeTableById(int id) throws Exception {
             put("success", true);
         }};
     }
+
+
 }