svn application별 분리 및 다중 조회기능 추가

Author: zimmyrabbit

zimmyrabbit/templates/jenkins/main.html

@@ -58,18 +58,24 @@
                 'X-CSRFToken': csrftoken // CSRF 토큰 요청 헤더에 포함
             },
             success : function(data) {
-                
                 let str = '';
-                str += '<table>';
-
-                for(var i=0; i<data.account.length; i++) {
-                    str += "  <tr>";
-			 		str += "	  <td>" + data.account[i] + "</td>";
-			 		str += "   	  <td>" + data.commitLogs[i] + "</td>";
-                    str += "   	  <td>" + data.dates[i] + "</td>";
-			 		str += "  </tr>"
+                for(var i=0; i<data.length; i++) {
+                    str += "<h1>" + data[i].package + "</h1>"
+                    str += '<table>';
+                    str += '<tr>';
+                    str += '<th>Account</th>';
+                    str += '<th>Commit Logs</th>';
+                    str += '<th>Dates</th>';
+                    str += '</tr>';
+                    for(var j=0; j<data[i].context.account.length; j++) {
+                        str += "  <tr>";
+                        str += "	  <td>" + data[i].context.account[j] + "</td>";
+                        str += "   	  <td>" + data[i].context.commitLogs[j] + "</td>";
+                        str += "   	  <td>" + data[i].context.dates[j] + "</td>";
+                        str += "  </tr>"
+                    }
+                    str += '</table>'
                 }
-                str += '</table>'
                 $(".svnlog").html(str);
             },
             error: function() {

zimmyrabbit/zimmyrabbit/views.py

@@ -11,6 +11,7 @@
 from rest_framework.views import APIView
 from rest_framework.response import Response
 from django.http import Http404
+from datetime import datetime
 
 from .serializers import BuildHistSerializer
 from .models import BuildHist
@@ -26,34 +27,47 @@ def check_model(request) :
     content = jsonObject.get('content')
     scontent = sorted(set(content.split()))
 
-    command = os.environ.get("SVN_ADDRESS") + content + '\"'
-    print(command)
-    output = subprocess.check_output(command, shell=True, text=True)
-
-    # 결과 파싱하여 계정, 날짜, 커밋로그 저장
-    commits = []
-    lines = output.split('------------------------------------------------------------------------')
-
-    accounts = []
-    dates = []
-    commit_logs = []
-
-    for i in range(1, len(lines)-1):
-        line = lines[i].split(" | ")
-        account = line[1].strip()
-        date = line[2].strip()
-        commit_log = line[-1].strip()
-        accounts.append(account)
-        dates.append(date)
-        commit_logs.append(commit_log)
-
-    print("Accounts:", accounts)
-    print("Dates:", dates)
-    print("Commit Logs:", commit_logs)
-    
-    context = {'account': accounts, 'dates': dates, 'commitLogs' : commit_logs}
+    all_contexts = []
+
+    for i in range(0,len(scontent)): 
+        app = scontent[i][-2:]
+        comp = scontent[i].split("_")[0]
+        package = scontent[i].split("_")[1]
+        contentUrl = ''
+        if app == "xp" :
+            contentUrl = f'xpapps/{comp}/{package}'
+        else :
+            contentUrl = f'components/{comp}/{package}'
+
+        command = os.environ.get("SVN_ADDRESS") + contentUrl + '\"'
+        print(command)
+        output = subprocess.check_output(command, shell=True, text=True)
+
+        # 결과 파싱하여 계정, 날짜, 커밋로그 저장
+        commits = []
+        lines = output.split('------------------------------------------------------------------------')
+
+        accounts = []
+        dates = []
+        commit_logs = []
+
+        for j in range(1, len(lines)-1):
+            line = lines[j].split(" | ")
+            account = line[1].strip()
+            date = line[2].strip()
+            commit_log = line[-1].strip()
+            accounts.append(account)
+            dates.append(date)
+            commit_logs.append(commit_log)
+
+        print("Accounts:", accounts)
+        print("Dates:", dates)
+        print("Commit Logs:", commit_logs)
+        
+        context = {'account': accounts, 'dates': dates, 'commitLogs' : commit_logs}
+        all_contexts.append({'context' : context, 'package' : package})
 
-    return JsonResponse(context)
+    return JsonResponse(all_contexts, safe=False)
 
 def request_build(request):
     jsonObject = json.loads(request.body)