Merge pull request #105 from UESTC-ACM/master

Release v2.1.1

Author: ruinshe

doc/cdoj.mwb

@@ -55,19 +55,19 @@ public StatusCondition() {
   /**
    * Submit user id.
    */
-  @Exp(mapField = "userByUserId", type = Condition.ConditionType.EQUALS)
+  @Exp(mapField = "userId", type = Condition.ConditionType.EQUALS)
   public Integer userId;
 
   /**
    * Problem id.
    */
-  @Exp(mapField = "problemByProblemId", type = Condition.ConditionType.EQUALS)
+  @Exp(mapField = "problemId", type = Condition.ConditionType.EQUALS)
   public Integer problemId;
 
   /**
    * Language.
    */
-  @Exp(mapField = "languageByLanguageId", type = Condition.ConditionType.EQUALS)
+  @Exp(mapField = "languageId", type = Condition.ConditionType.EQUALS)
   public Integer languageId;
 
   /**
@@ -103,10 +103,10 @@ public Condition getCondition() throws AppException {
     Condition condition = super.getCondition();
     if (contestId != null) {
       if (contestId == -1) {
-        condition.addEntry("contestByContestId", Condition.ConditionType.IS_NULL,
+        condition.addEntry("contestId", Condition.ConditionType.IS_NULL,
             null);
       } else {
-        condition.addEntry("contestByContestId", Condition.ConditionType.EQUALS,
+        condition.addEntry("contestId", Condition.ConditionType.EQUALS,
             contestId);
       }
     }

trunk/src/main/java/cn/edu/uestc/acmicpc/db/condition/impl/StatusCondition.java

@@ -4,16 +4,27 @@
  * DTO from team create form
  */
 public class TeamEditDTO {
-  private String teamName;
-  private String memberList;
+  private Integer teamId;
 
-  public TeamEditDTO() {
+  public TeamEditDTO(Integer teamId, String teamName, String memberList) {
+    this.teamId = teamId;
+    this.teamName = teamName;
+    this.memberList = memberList;
   }
 
-  public TeamEditDTO(String teamName, String memberList) {
+  public Integer getTeamId() {
 
-    this.teamName = teamName;
-    this.memberList = memberList;
+    return teamId;
+  }
+
+  public void setTeamId(Integer teamId) {
+    this.teamId = teamId;
+  }
+
+  private String teamName;
+  private String memberList;
+
+  public TeamEditDTO() {
   }
 
   public String getTeamName() {

trunk/src/main/java/cn/edu/uestc/acmicpc/db/dto/impl/team/TeamEditDTO.java

@@ -7,17 +7,37 @@
 
 import java.util.Map;
 
-@Fields({"teamId", "userId", "userByUserId.userName", "userByUserId.email", "userByUserId.nickName"
+@Fields({"teamUserId", "teamId", "userId", "userByUserId.userName", "userByUserId.email", "userByUserId.nickName"
     , "allow"})
 public class TeamUserListDTO implements BaseDTO<TeamUser> {
 
+  private Integer teamUserId;
   private Integer teamId;
   private Integer userId;
   private String userName;
   private String email;
   private String nickName;
   private Boolean allow;
 
+  public TeamUserListDTO(Integer teamUserId, Integer teamId, Integer userId, String userName,
+                         String email, String nickName, Boolean allow) {
+    this.teamUserId = teamUserId;
+    this.teamId = teamId;
+    this.userId = userId;
+    this.userName = userName;
+    this.email = email;
+    this.nickName = nickName;
+    this.allow = allow;
+  }
+
+  public Integer getTeamUserId() {
+    return teamUserId;
+  }
+
+  public void setTeamUserId(Integer teamUserId) {
+    this.teamUserId = teamUserId;
+  }
+
   public Boolean getAllow() {
     return allow;
   }
@@ -34,17 +54,6 @@ public void setNickName(String nickName) {
     this.nickName = nickName;
   }
 
-  public TeamUserListDTO(Integer teamId, Integer userId, String userName, String email,
-                         String nickName, Boolean allow) {
-
-    this.teamId = teamId;
-    this.userId = userId;
-    this.userName = userName;
-    this.email = email;
-    this.nickName = nickName;
-    this.allow = allow;
-  }
-
   public Integer getTeamId() {
     return teamId;
   }
@@ -89,11 +98,12 @@ private Builder() {
 
     @Override
     public TeamUserListDTO build() {
-      return new TeamUserListDTO(teamId, userId, userName, email, nickName, allow);
+      return new TeamUserListDTO(teamUserId, teamId, userId, userName, email, nickName, allow);
     }
 
     @Override
     public TeamUserListDTO build(Map<String, Object> properties) {
+      teamUserId = (Integer) properties.get("teamUserId");
       teamId = (Integer) properties.get("teamId");
       userId = (Integer) properties.get("userId");
       userName = (String) properties.get("userByUserId.userName");
@@ -103,13 +113,19 @@ public TeamUserListDTO build(Map<String, Object> properties) {
       return build();
     }
 
+    private Integer teamUserId;
     private Integer teamId;
     private Integer userId;
     private String userName;
     private String email;
     private String nickName;
     private Boolean allow;
 
+    public Builder setTeamUserId(Integer teamUserId) {
+      this.teamUserId = teamUserId;
+      return this;
+    }
+
     public Builder setTeamId(Integer teamId) {
       this.teamId = teamId;
       return this;

trunk/src/main/java/cn/edu/uestc/acmicpc/db/dto/impl/teamUser/TeamUserListDTO.java

@@ -171,6 +171,7 @@ private String[] getCallBackString(String shellCommand) {
    * @param judgeItem judge item to be judged
    */
   void judge(JudgeItem judgeItem) {
+    LOGGER.info("Start judging status#" + judgeItem.getStatusForJudgeDTO().getStatusId());
     try {
       int numberOfTestCase = judgeItem.getStatusForJudgeDTO().getDataCount();
       boolean isAccepted = true;

trunk/src/main/java/cn/edu/uestc/acmicpc/judge/entity/Judge.java

@@ -79,6 +79,7 @@ private void searchForJudge(boolean isFirstTime) {
         judgeItem.setStatusForJudgeDTO(status);
         statusService.updateStatusByStatusForJudgeDTO(status);
         judgeQueue.put(judgeItem);
+        LOGGER.info("Put status#" + status.getStatusId() + " into judge queue.");
       }
     } catch (AppException e) {
       LOGGER.error(e);

trunk/src/main/java/cn/edu/uestc/acmicpc/judge/entity/Scheduler.java

@@ -4,8 +4,6 @@
 import cn.edu.uestc.acmicpc.db.dto.impl.message.MessageDTO;
 import cn.edu.uestc.acmicpc.db.dto.impl.message.MessageForReceiverDTO;
 import cn.edu.uestc.acmicpc.db.dto.impl.message.MessageForUserDTO;
-import cn.edu.uestc.acmicpc.db.dto.impl.team.TeamDTO;
-import cn.edu.uestc.acmicpc.db.dto.impl.user.UserDTO;
 import cn.edu.uestc.acmicpc.db.entity.Message;
 import cn.edu.uestc.acmicpc.util.exception.AppException;
 import cn.edu.uestc.acmicpc.web.dto.PageInfo;
@@ -35,16 +33,6 @@ public interface MessageService extends DatabaseService<Message, Integer> {
    */
   public MessageDTO getMessageDTO(Integer messageId) throws AppException;
 
-  /**
-   * Send a team invitation.
-   *
-   * @param sender   invitation sender
-   * @param receiver invitation receiver
-   * @param teamDTO  team information
-   * @throws AppException
-   */
-  public void sendTeamInvitation(UserDTO sender, UserDTO receiver, TeamDTO teamDTO) throws AppException;
-
   /**
    * Counts the number of messages fit in condition.
    *

trunk/src/main/java/cn/edu/uestc/acmicpc/service/iface/MessageService.java

@@ -93,4 +93,12 @@ public List<TeamTypeAHeadDTO> getTeamTypeAHeadList(TeamCondition teamCondition,
    * @throws AppException
    */
   public Integer getTeamIdByTeamName(String teamName) throws AppException;
+
+  /**
+   * Delete team in database.
+   *
+   * @param teamDTO {@link TeamDTO} entity
+   * @throws AppException
+   */
+  public void deleteTeam(TeamDTO teamDTO) throws AppException;
 }

trunk/src/main/java/cn/edu/uestc/acmicpc/service/iface/TeamService.java

@@ -36,4 +36,6 @@ public interface TeamUserService extends DatabaseService<TeamUser, Integer> {
   public void changeAllowState(Integer userId, Integer teamId, Boolean value) throws AppException;
 
   public List<TeamUserListDTO> getTeamUserList(Integer teamId) throws AppException;
+
+  public void removeTeamUser(Integer teamUserId) throws AppException;
 }

trunk/src/main/java/cn/edu/uestc/acmicpc/service/iface/TeamUserService.java

@@ -6,20 +6,16 @@
 import cn.edu.uestc.acmicpc.db.dto.impl.message.MessageDTO;
 import cn.edu.uestc.acmicpc.db.dto.impl.message.MessageForReceiverDTO;
 import cn.edu.uestc.acmicpc.db.dto.impl.message.MessageForUserDTO;
-import cn.edu.uestc.acmicpc.db.dto.impl.team.TeamDTO;
-import cn.edu.uestc.acmicpc.db.dto.impl.user.UserDTO;
 import cn.edu.uestc.acmicpc.db.entity.Message;
 import cn.edu.uestc.acmicpc.service.iface.MessageService;
 import cn.edu.uestc.acmicpc.util.exception.AppException;
 import cn.edu.uestc.acmicpc.util.exception.AppExceptionUtil;
-import cn.edu.uestc.acmicpc.util.helper.StringUtil;
 import cn.edu.uestc.acmicpc.util.settings.Settings;
 import cn.edu.uestc.acmicpc.web.dto.PageInfo;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.sql.Timestamp;
 import java.util.List;
 
 /**
@@ -65,31 +61,6 @@ public MessageDTO getMessageDTO(Integer messageId) throws AppException {
         messageId);
   }
 
-  @Override
-  public void sendTeamInvitation(UserDTO sender, UserDTO receiver, TeamDTO teamDTO)
-      throws AppException {
-    String userCenterUrl = settings.SETTING_HOST
-        + "/#/user/center/" + receiver.getUserName() + "/teams";
-    StringBuilder messageContent = new StringBuilder();
-    messageContent.append(StringUtil.getAtLink(sender.getUserName(), sender.getUserId()))
-        .append(" has invited you to join team ")
-        .append(teamDTO.getTeamName())
-        .append(".\n\n")
-        .append("See [your teams](")
-        .append(userCenterUrl)
-        .append(") for more details.");
-    Integer messageId = createNewMessage(MessageDTO.builder()
-        .setSenderId(sender.getUserId())
-        .setReceiverId(receiver.getUserId())
-        .setTime(new Timestamp(System.currentTimeMillis()))
-        .setIsOpened(false)
-        .setTitle("Team invitation.")
-        .setContent(messageContent.toString())
-        .build());
-    MessageDTO messageDTO = getMessageDTO(messageId);
-    AppExceptionUtil.assertNotNull(messageDTO, "Error while sending notification.");
-  }
-
   @Override
   public Long count(MessageCondition condition) throws AppException {
     return messageDAO.count(condition.getCondition());