From 3e7fbf348997273f5e97c085e3bcb423a58497f1 Mon Sep 17 00:00:00 2001
From: wanjia <553039491@qq.com>
Date: Tue, 11 Apr 2023 13:35:47 +0800
Subject: [PATCH] =?UTF-8?q?getLimitFromLimitEvents=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/user/impl/UserService.java        | 46 ++++++++++++-------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java b/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java
index e33f83e..024a771 100644
--- a/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java
+++ b/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java
@@ -109,6 +109,7 @@ public class UserService extends AbstractUserBot implements IUserService {
            botOutputVO.setIsTransfer(0);
            botOutputVO.setIsTransferSuccess(3);
         }
+        getRegisterBotResponse.setBotOutputVO(botOutputVO);
         getRegisterBotResponse.setUserId(userId);
         return getRegisterBotResponse;
     }
@@ -343,6 +344,7 @@ public class UserService extends AbstractUserBot implements IUserService {
                     issueLimit.setReadWriteCode(2);
                     issueLimit.setReadWriteIssue(jurisDictionIssue);
                     limitList.add(issueLimit);
+                    break;
             }
         });
       return limitList;
@@ -434,15 +436,22 @@ public class UserService extends AbstractUserBot implements IUserService {
         botLimitEvents.forEach(botLimitEvent -> {
 
             switch (botLimitEvent.getEvent()) {
-                case (0 | 1 | 2):
+                case 0:
+                case 1:
+                case 2:
                     codeStr.add(botLimitEvent.getEvent().toString());
-                    limitVO.setJurisDictionCode(botLimitEvent.getReadWriteCode());
-                case (3 | 4 | 6):
+                    limitVO.setJurisDictionCode(botLimitEvent.getReadWriteCode());break;
+                case 3:
+                case 4:
+                case 6:
                     prStr.add(botLimitEvent.getEvent().toString());
-                    limitVO.setJurisDictionPr(botLimitEvent.getReadWritePr());
-                case (7 | 8 | 9 | 10):
+                    limitVO.setJurisDictionPr(botLimitEvent.getReadWritePr());break;
+                case 7:
+                case 8:
+                case 9:
+                case 10:
                     issueStr.add(botLimitEvent.getEvent().toString());
-                    limitVO.setJurisDictionIssue(botLimitEvent.getReadWriteIssue());
+                    limitVO.setJurisDictionIssue(botLimitEvent.getReadWriteIssue());break;
             }
         });
 
@@ -458,6 +467,7 @@ public class UserService extends AbstractUserBot implements IUserService {
 
         limitVO.setEventPr(prStr.toString());
         limitVO.setEventCode(codeStr.toString());
+        limitVO.setEventIssue(issueStr.toString());
 
         log.info("limitVO:{}",limitVO);
         return limitVO;
@@ -509,7 +519,7 @@ public class UserService extends AbstractUserBot implements IUserService {
         botOutputVO.setIsPublic(bot.getIsPublic());
         botOutputVO.setWebhook(bot.getWebhook());
         botOutputVO.setUserId(botInputVO.getUserId());
-        botOutputVO.setWebUrl(bot.getWebUrl());;
+        botOutputVO.setWebUrl(bot.getWebUrl());
         botOutputVO.setLimitAndEvents(botInputVO.getLimitAndEvents());
         botOutputVO.setLogo(bot.getLogo());
         botOutputVO.setOauthCallbackUrl(bot.getOauthCallbackUrl());
@@ -795,25 +805,25 @@ public class UserService extends AbstractUserBot implements IUserService {
             event = limitEvents.get(i).getEvent();
             switch (event) {
                 case 0:
-                    objects[i]="push";
+                    objects[i]="push"; break;
                 case 1:
-                    objects[i]="create";
+                    objects[i]="create"; break;
                 case 2:
-                    objects[i]="delete";
+                    objects[i]="delete"; break;
                 case 3:
-                    objects[i]="pull_request_only";
+                    objects[i]="pull_request_only"; break;
                 case 4:
-                    objects[i]="pull_request_assign";
+                    objects[i]="pull_request_assign"; break;
                 case 6:
-                    objects[i]="pull_request_comment";
+                    objects[i]="pull_request_comment"; break;
                 case 7:
-                    objects[i]="issue_only";
+                    objects[i]="issue_only"; break;
                 case 8:
-                    objects[i]="issue_assign";
+                    objects[i]="issue_assign"; break;
                 case 9:
-                    objects[i]="issue_label";
+                    objects[i]="issue_label"; break;
                 case 10:
-                    objects[i]="issue_comment";
+                    objects[i]="issue_comment"; break;
             }
         }
         Bot bot = botMapper.selectById(limitEvents.get(0).getBotId());
@@ -1241,6 +1251,7 @@ public class UserService extends AbstractUserBot implements IUserService {
                 stringBuilder.append(botLimitEvent.getEvent());
                 stringBuilder.append(botLimitEvent.getReadWritePr());
                 stringBuilder.append(botLimitEvent.getReadWriteCode());
+                stringBuilder.append(botLimitEvent.getReadWriteIssue());
                 stringBuilder.append(botLimitEvent.getAuthCategory());
                 limitEventString.add(stringBuilder.toString());
             });
@@ -1250,6 +1261,7 @@ public class UserService extends AbstractUserBot implements IUserService {
                 stringBuilder.append(limit.getEvent());
                 stringBuilder.append(limit.getReadWritePr());
                 stringBuilder.append(limit.getReadWriteCode());
+                stringBuilder.append(limit.getReadWriteIssue());
                 stringBuilder.append(limit.getAuthCategory());
                 limitString.add(stringBuilder.toString());
             });