Merge pull request #357 from prathambatra/conflicted-claims-2

Added Conflicted Claims Feature

Author: thenamankumar

routes/root.js

@@ -12,6 +12,8 @@ const du = require('./../utils/datautils')
 
 const { BOSS_END_DATE, BOSS_START_DATE } = require('./../utils/consts')
 
+const { getUrlDetails } = require('../utils/urlUtils')
+
 const route = new Router()
 
 let adminUser = process.env.BOSS_ADMIN || config.secrets.BOSS_DB_USER
@@ -228,17 +230,6 @@ route.get('/claims/add', auth.ensureLoggedInGithub, (req, res) => {
   })
 })
 
-route.get('/claims/:id', auth.adminOnly, (req, res) => {
-  du.getClaimById(req.params.id)
-    .then(claim => {
-      if (!claim) throw new Error('No claim found')
-      res.render('pages/claims/id', { claim })
-    })
-    .catch(err => {
-      res.send('Error fetching claim id = ' + escapeHtml(req.params.id))
-    })
-})
-
 route.post('/claims/add', auth.ensureLoggedInGithub, (req, res) => {
   if (Date.now() > BOSS_END_DATE.getTime()) {
     return res.send("Sorry. Boss has ended, can't add claim from now.")
@@ -262,6 +253,29 @@ route.post('/claims/add', auth.ensureLoggedInGithub, (req, res) => {
     })
 })
 
+route.get('/claims/:id', auth.adminOnly, (req, res) => {
+  du.getClaimById(req.params.id)
+    .then(claim => {
+      if (!claim) throw new Error('No claim found')
+      pullUrlDetail = getUrlDetails(claim["pullUrl"])
+      issueUrlDetail = getUrlDetails(claim["issueUrl"])
+      du.getConflictedClaims(claim,issueUrlDetail,pullUrlDetail.type)
+        .then(conflictedClaims => {
+          if(conflictedClaims.length === 0)
+            res.render('pages/claims/id',{claim, hasConflict: false })
+          else
+            res.render('pages/claims/id',{ claim, hasConflict: true, conflictedClaims })
+        })
+        .catch(err => {
+          res.send('Error getting conflicting claims')
+        })
+    })
+    .catch(err => {
+      console.log(err)
+      res.send('Error fetching claim id = ' + escapeHtml(req.params.id))
+    })
+})
+
 route.post('/claims/:id/update', auth.adminOnly, (req, res) => {
   du.updateClaim(req.params.id, req.body)
     .then(result => {

utils/datautils.js

@@ -4,6 +4,7 @@
 const db = require('./db')
 const fs = require('fs')
 const consts = require('./consts')
+const {Op} = require('sequelize')
 
 function getContestPeriod(year) {
   if (year)
@@ -77,6 +78,26 @@ function delClaim(claimId) {
   })
 }
 
+function getConflictedClaims(claim,issueUrlDetail,pullUrlType) {
+  projectName = '/' + issueUrlDetail.project + '/'
+  issueId = '/' + issueUrlDetail.id
+  pullUrlType = projectName + pullUrlType + '/'
+  return db.Claim.findAll({
+    where : {
+      [Op.and] : [
+        {
+          [Op.or] : [
+            { issueUrl: { [Op.like]: '%' + projectName + '%' + issueId } },
+            { issueUrl: { [Op.like]: '%' + projectName + '%' + issueId + '/' } }
+          ]
+        },
+        { pullUrl: { [Op.like]: '%' + pullUrlType + '%' } },
+        { id : { [Op.ne] : claim.id } }
+      ]
+    }
+  })
+}
+
 function updateClaim(claimId, { status, reason, bounty }) {
   const claim = {
     action: 'update',
@@ -230,5 +251,6 @@ module.exports = {
   getClaimById,
   updateClaim,
   getCounts,
+  getConflictedClaims,
   getResourceFromUrl
 }

utils/urlUtils.js

@@ -0,0 +1,18 @@
+function getUrlDetails(url) {
+    let urlDetails = {
+        project : "",
+        type : "",
+        id : ""
+    }
+
+    url = url.split('/')
+    position = url.indexOf('github.com')
+
+    urlDetails.project = url[position+2]
+    urlDetails.type = url[position+3]
+    urlDetails.id = url[position+4]
+
+    return urlDetails;
+}
+
+module.exports = { getUrlDetails }

views/pages/claims/id.hbs

@@ -109,6 +109,53 @@
                 </div>
             </div>
         </div>
+        {{#if hasConflict}}
+            <h3 style="margin-top: 1em;">Conflicted claims</h3>
+            {{#each conflictedClaims as |conflictedClaim|}}
+            <div class="card">
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-md-4">
+                            <div class="text-center">
+                                <h1>
+                                    <span>{{conflictedClaim.bounty}}</span>
+                                </h1>
+                                <small>bounty points</small>
+                                <hr />
+                                <button class="btn btn-primary btn-sm" onclick="OpenConflict({{conflictedClaim.id}})">View conflict</button>
+                                <script>
+                                    function OpenConflict(conflictId) {
+                                        window.location.href = conflictId
+                                    }
+                                </script>
+                            </div>
+                        </div>
+                        <div class="col-md-8">
+                            <a href="/claims/view?username={{conflictedClaim.user}}&status={{status}}">
+                                <h5 class="card-title">{{conflictedClaim.user}}</h5>
+                            </a>
+                            <p class="card-text">
+                                <small class="text-muted">Project : <a
+                                href="https://www.github.com/coding-blocks/">{{conflictedClaim.repo}}</a></small>
+                                <br />
+                            </p>
+                            <p class="card-text">
+                                <span class="text-muted">Issue: <small><a
+                                        href="{{conflictedClaim.issueUrl}}">{{conflictedClaim.issueUrl}}</a></small></span>
+                                <br />
+
+                                <span class="text-muted">Pull Request: <small><a
+                                        href="{{conflictedClaim.pullUrl}}">{{conflictedClaim.pullUrl}}</a></small></span>
+                                <br />
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        {{/each}}
+        {{else}}
+            <h3 style="margin-top: 1em;">No Conflicted claims</h3>
+        {{/if}}
     </div>
 </div>
 {{!-- <div class="four wide item">
@@ -120,7 +167,6 @@
             <select name="status" class="ui dropdown" id="status">
             </select>
         </div>
-
         <label>Reason </label>
         <textarea name="reason" id="reason"> {{claim.reason}} </textarea>
         <br />
@@ -138,4 +184,4 @@
                 $('#reason').html('').hide();
         });
     </script>
-</div> --}}
+</div> --}}