Skip to content

Commit 41c6b0a

Browse files
committed
refactor: reorganize project structure and update configurations
1 parent 8f13579 commit 41c6b0a

File tree

6 files changed

+3
-20
lines changed

6 files changed

+3
-20
lines changed

gitlab_integration/webhook_listener.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33

44
from flask import request, jsonify
55

6-
from app.gitlab_utils import get_merge_request_id, get_commit_change_file, get_merge_request_changes
76
from gitlab_integration.gitlab_fetcher import GitlabMergeRequestFetcher
87
from reply_module.reply import Reply
98
from review_engine.review_engine import ReviewEngine
10-
from service.chat_review import review_code_for_mr, review_code_for_add_commit
11-
from utils.dingding import send_dingtalk_message_by_sign
129
from utils.logger import log
1310

1411

@@ -75,20 +72,6 @@ def handle_push(self, gitlab_payload, reply):
7572
"""
7673
处理推送事件
7774
"""
78-
project_id = gitlab_payload.get('project')['id']
79-
merge_request_id = get_merge_request_id(gitlab_payload.get('ref').split("/")[-1], gitlab_payload.get("project_id"))
80-
81-
82-
if not merge_request_id:
83-
send_dingtalk_message_by_sign(
84-
f"Project_Name:{gitlab_payload['project']['name']}\n备注:分支 {gitlab_payload.get('ref')} 没有处于open状态的 Merge Request 不进行 Code Review。")
85-
return jsonify({'status': f'非存在MR分支,{gitlab_payload}'}), 200
86-
87-
changed_files = get_commit_change_file(gitlab_payload)
88-
89-
thread = threading.Thread(target=review_code_for_add_commit,
90-
args=(project_id, merge_request_id, changed_files, gitlab_payload))
91-
thread.start()
9275

9376
return jsonify({'status': 'success'}), 200
9477

File renamed without changes.

reply_module/reply.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import threading
22

3-
from reply_module.reply_target.reply_factory import ReplyFactory
3+
from reply_module.reply_factory import ReplyFactory
44

55

66
class Reply:
File renamed without changes.

reply_module/reply_target/dingtalk_reply.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import json
88
from config.config import *
99
from utils.logger import *
10-
from reply_module.reply_target.abstract_reply import AbstractReply
10+
from reply_module.abstract_reply import AbstractReply
1111

1212

1313
class DingtalkReply(AbstractReply):

reply_module/reply_target/gitlab_reply.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import requests
22
from retrying import retry
33
from config.config import *
4-
from reply_module.reply_target.abstract_reply import AbstractReply
4+
from reply_module.abstract_reply import AbstractReply
55
from utils.logger import log
66

77
# 继承AbstractReply类,实现send方法

0 commit comments

Comments
 (0)