Copilot updates - challenge 30069830

#60
#59
#47
#58
#33
#41
https://github.com/topcoder-platform/topcoder-x-ui/issues/57​
#56
#35
#55
#51

Author: jmgasper

configuration.md

@@ -24,6 +24,8 @@ The following config parameters are supported, they are defined in `src/config.j
 | HOOK_BASE_URL            | The base URL of the topcoder-x-receiver, used when adding webhooks automatically to repositories | |
 | TOPCODER_ENV | The topcoder environment to use, can support 'dev' or 'prod' | 'dev'                     |
 |LABELS| Labels we are going to add to the repository in the form of array of object with `name` and `color` property. Color should be hex code without hash||
+|ALLOWED_TOPCODER_ROLES| The allowed Topcoder role to use Topcoder X app| see configuration |
+|COPILOT_ROLE| The role to identify copilot|'copilot'|
 
 ## GitHub OAuth App Setup
 

src/app.js

@@ -76,6 +76,20 @@ _.forEach(routes, (verbs, path) => {
         return next();
       });
     }
+    if (def.allowedRoles) {
+      actions.push((req, res, next) => {
+        // check if user has allowed roles
+        if (_(req.currentUser.roles).map((i) => i.toLowerCase())
+          .intersection(_.map(def.allowedRoles, (j) => j.toLowerCase())).size() === 0) {
+          const statusCode = 403;
+          return res.status(statusCode).json({
+            code: 'Forbidden',
+            message: 'You are not allowed to access this resource.',
+          });
+        }
+        return next();
+      });
+    }
     actions.push(method);
     app[verb](`/api/${config.API_VERSION}${path}`, actions);
   });

src/config.js

@@ -35,6 +35,7 @@ module.exports = {
   },
   HOOK_BASE_URL: process.env.HOOK_BASE_URL || 'http://topcoderx.topcoder-dev.com',
   TOPCODER_ENV: process.env.TOPCODER_ENV || 'dev',
-  LABELS: process.env.LABELS || [{ name: 'Open for pickup', color: '428BCA' }, { name: 'Assigned', color: '004E00' }, { name: 'Ready for review', color: 'D1D100' }, { name: 'Paid', color: '7F8C8D' }, { name: 'Feedback', color: 'FF0000' }, { name: 'Fix accepted', color: '69D100' }],
+  LABELS: process.env.LABELS || [{ name: 'tcx_OpenForPickup', color: '428BCA' }, { name: 'tcx_Assigned', color: '004E00' }, { name: 'tcx_ReadyForReview', color: 'D1D100' }, { name: 'tcx_Paid', color: '7F8C8D' }, { name: 'tcx_Feedback', color: 'FF0000' }, { name: 'tcx_FixAccepted', color: '69D100' }],
   ALLOWED_TOPCODER_ROLES: process.env.ALLOWED_TOPCODER_ROLES || ['administrator', 'admin', 'connect manager', 'connect admin', 'copilot', 'connect copilot'],
+  COPILOT_ROLE: process.env.COPILOT_ROLE || 'copilot',
 };

src/controllers/PaymentController.js renamed to src/controllers/CopilotPaymentController.js

@@ -9,7 +9,7 @@
  * @version 1.0
  */
 const helper = require('../common/helper');
-const PaymentService = require('../services/PaymentService');
+const CopilotPaymentService = require('../services/CopilotPaymentService');
 
 /**
  * update payments status
@@ -18,7 +18,7 @@ const PaymentService = require('../services/PaymentService');
  * @returns {Promise} fetch payment updates execution
  */
 async function updateAll(req) {
-    return await PaymentService.updateAll(req.currentUser);
+    return await CopilotPaymentService.updateAll(req.currentUser);
 }
 
 /**
@@ -28,12 +28,12 @@ async function updateAll(req) {
  * @returns {Object} the result
  */
 async function getAll(req) {
-    const payments = await PaymentService.getAll(req.query);
+    const payments = await CopilotPaymentService.getAll(req.query, req.currentUser);
     const active = [];
     const closed = [];
 
     payments.forEach(function (payment) {
-        if (payment.closed === "true") {
+        if (payment.closed === true) {
             closed.push(payment);
         } else {
             active.push(payment);
@@ -49,7 +49,7 @@ async function getAll(req) {
  * @returns {Object} the result
  */
 async function create(req) {
-    return await PaymentService.create(req.currentUser, req.body.payment);
+    return await CopilotPaymentService.create(req.currentUser, req.body.payment);
 }
 
 /**
@@ -59,7 +59,7 @@ async function create(req) {
  * @returns {Object} the result
  */
 async function update(req) {
-    return await PaymentService.update(req.currentUser, req.body.payment);
+    return await CopilotPaymentService.update(req.currentUser, req.body.payment);
 }
 
 /**
@@ -69,7 +69,7 @@ async function update(req) {
  * @returns {Object} the result
  */
 async function remove(req) {
-    return await PaymentService.remove(req.params.id, req.currentUser);
+    return await CopilotPaymentService.remove(req.params.id, req.currentUser);
 }
 
 

src/front/src/app/add-payment/add-payment-controller.js renamed to src/front/src/app/add-copilot-payment/add-copilot-payment-controller.js

@@ -1,21 +1,21 @@
 'use strict';
 
 angular.module('topcoderX')
-    .controller('AddPaymentController', ['$scope', '$log', '$state', 'PaymentService', 'ProjectService', '$filter', '$rootScope', '$timeout', 'Alert',
-        function ($scope, $log, $state, PaymentService, ProjectService, $filter, $rootScope, $timeout, Alert) {
+    .controller('AddCopilotPaymentController', ['$scope', '$log', '$state', 'CopilotPaymentService', 'ProjectService', '$filter', '$rootScope', '$timeout', 'Alert',
+        function ($scope, $log, $state, CopilotPaymentService, ProjectService, $filter, $rootScope, $timeout, Alert) {
             // below logic is trying to identify whether we are editing a payment
             $scope.editing = true;
             $scope.projects = [];
             $scope.payment = {
                 project: null,
                 amount: null,
                 description: '',
-                challenge: '',
             };
             if ($rootScope.payment) {
                 $scope.title = 'Edit a Payment';
-                $scope.payment = $rootScope.payment;
+                $scope.payment = angular.copy($rootScope.payment);
                 $scope.payment.id = $rootScope.payment.id;
+                $scope.payment.project = $rootScope.payment.project.id;
                 $scope.editing = true;
             } else {
                 $scope.title = 'Add a Payment';
@@ -27,49 +27,40 @@ angular.module('topcoderX')
                 ProjectService.getProjects().then(function (response) {
                     $scope.projects = response.data;
                 }).catch(function (error) {
-                    _handleError({
-                        data:
-                            { error: error, message: 'There are not projects in Topcoder-X. Please create a project first.' }
-                    });
+                    _handleError(error, 'There are no projects in Topcoder-X. Please create a project first.');
                 });
             };
 
             $scope.getProjects();
 
             // handle error output
-            function _handleError(error, defualtMsg) {
-                const errMsg = error.data ? error.data.message : defualtMsg;
-                Alert(errMsg, $scope);
+            function _handleError(error, defaultMsg) {
+                const errMsg = error.data ? error.data.message : defaultMsg;
+                Alert.error(errMsg, $scope);
             }
 
             // create/update payment item
             $scope.save = function () {
                 if (!$scope.editing) {
-                    PaymentService.create($scope.payment).then(function (res) {
-                        $log.info(res);
+                    CopilotPaymentService.create($scope.payment).then(function () {
                         $state.go('app.copilotPayments');
-                    }).catch(function () {
-                        Alert.error('Error Creating Payment', $scope);
+                    }).catch(function (error) {
+                        _handleError(error, 'An error occurred while creating Payment.');
                     });
                 }
                 if ($scope.editing) {
-                    PaymentService.update({
+                    CopilotPaymentService.update({
                         id: $scope.payment.id,
                         project: $scope.payment.project,
                         amount: $scope.payment.amount,
                         description: $scope.payment.description,
-                        challenge: $scope.payment.challenge,
-                        closed: $scope.payment.closed
-                    }).then(function (res) {
-                        $timeout(function () {
-                            $log.info(res);
-                            $rootScope.payment = null;
-                            $state.go('app.copilotPayments');
-                        }, 6000);
-                    }).catch(function () {
-                        Alert.error('Error Updating Payment', $scope);
+                    }).then(function () {
+                        $rootScope.payment = null;
+                        $state.go('app.copilotPayments');
+                    }).catch(function (error) {
+                        _handleError(error, 'An error occurred while updating Payment.');
                     });
                 }
-            };
+            };            
         }
     ]);

src/front/src/app/add-payment/add-payment.html renamed to src/front/src/app/add-copilot-payment/add-copilot-payment.html

@@ -1,4 +1,4 @@
-<div ng-controller="AddPaymentController">
+<div ng-controller="AddCopilotPaymentController">
     <div class="col-md-10 col-md-offset-1" ng-include src="'components/alert/alert.html'"></div>
     <div class="row wrapper border-bottom white-bg page-heading">
         <div class="col-lg-4">
@@ -21,14 +21,10 @@ <h2>{{title}}</h2>
                         <input class="form-control" type="number" ng-model="payment.amount" required/>
                         <span ng-show="paymentForm.payment.amount.$touched && paymentForm.payment.amount.$invalid">The payment Amount is required.</span>
                         <br />
-                        <label class="form-label">Desciption:</label>
+                        <label class="form-label">Description:</label>
                         <input class="form-control" type="text" ng-model="payment.description" required/>
                         <span ng-show="paymentForm.payment.description.$touched && paymentForm.payment.description.$invalid">The payment Description is required.</span>
                         <br />
-                        <label class="form-label">Challenge:</label>
-                        <input class="form-control" type="number" ng-model="payment.challenge" required/>
-                        <span ng-show="paymentForm.payment.challenge.$touched && paymentForm.payment.challenge.$invalid">The payment Challenge is required.</span>
-                        <br />
                         <br />
                         <button type="submit" class="with-button btn btn-sm btn-info" ng-click="paymentForm.$valid && save()">
                             <strong>

src/front/src/app/add-payment/add-payment-service.js

@@ -137,9 +137,9 @@ angular.module('topcoderX', [
             resolve: { auth: authenticate }
         })
         .state('app.addPayment', {
-            url: '/add-payment',
-            templateUrl: 'app/add-payment/add-payment.html',
-            controller: 'AddPaymentController',
+            url: '/copilot-payment',
+            templateUrl: 'app/add-copilot-payment/add-copilot-payment.html',
+            controller: 'AddCopilotPaymentController',
             controllerAs: 'vm',
             resolve: { auth: authenticate }
         });

src/front/src/app/app.js

@@ -6,7 +6,7 @@
 'use strict';
 
 angular.module('topcoderX')
-  .factory('PaymentService', ['$http', 'Helper', function ($http, Helper) {
+  .factory('CopilotPaymentService', ['$http', 'Helper', function ($http, Helper) {
     var baseUrl = Helper.baseUrl;
     var service = {};
 
@@ -15,7 +15,7 @@ angular.module('topcoderX')
      *
      */
     service.updateAll = function () {
-      return $http.post(baseUrl + '/api/v1/payments/updates/').then(function (response) {
+      return $http.post(baseUrl + '/api/v1/payments/copilot/updates/').then(function (response) {
         return response;
       });
     };
@@ -25,7 +25,7 @@ angular.module('topcoderX')
      *
      */
     service.getAll = function (query) {
-      return $http.get(baseUrl + '/api/v1/payments?sortBy=' + query).then(function (response) {
+      return $http.get(baseUrl + '/api/v1/payments/copilot?sortBy=' + query).then(function (response) {
         return response;
       });
     };
@@ -35,7 +35,7 @@ angular.module('topcoderX')
      *
      */
     service.create = function (bodyParam) {
-      return $http.post(baseUrl + '/api/v1/payments/', { payment: bodyParam }).then(function (response) {
+      return $http.post(baseUrl + '/api/v1/payments/copilot/', { payment: bodyParam }).then(function (response) {
         return response;
       });
     };
@@ -45,7 +45,7 @@ angular.module('topcoderX')
      *
      */
     service.update = function (bodyParam) {
-      return $http.put(baseUrl + '/api/v1/payments/', { payment: bodyParam }).then(function (response) {
+      return $http.put(baseUrl + '/api/v1/payments/copilot/', { payment: bodyParam }).then(function (response) {
         return response;
       });
     };
@@ -55,7 +55,7 @@ angular.module('topcoderX')
      *
      */
     service.delete = function (id) {
-      return $http.delete(baseUrl + '/api/v1/payments/' + (id || '')).then(function (response) {
+      return $http.delete(baseUrl + '/api/v1/payments/copilot/' + id).then(function (response) {
         return response.data;
       });
     };