Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 3e5c3f0

Browse files
author
Parth Shah
committed
using restangular
1 parent 059e6d6 commit 3e5c3f0

File tree

6 files changed

+68
-50
lines changed

6 files changed

+68
-50
lines changed

‎app/peer-review/edit-review/edit-review.controller.js

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,43 +63,36 @@
6363

6464
function activate() {
6565
var promises = [
66-
handle,
6766
ChallengeService.getChallengeDetails(vm.challengeId),
6867
ReviewService.getReview($stateParams.reviewId),
6968
ScorecardService.getScorecard(vm.challengeId)
7069
];
7170

7271
$q.all(promises)
73-
.then(function(response) {
74-
var user = response[0].data;
72+
.then(function(responses) {
7573
vm.stats.username = handle;
7674

77-
var challenge = response[1].data;
78-
vm.challenge = challenge;
75+
vm.challenge = responses[0];
7976

80-
var reviewData = response[2].data.result.content;
81-
vm.review = reviewData;
82-
vm.stats.submissionId = reviewData.submissionId;
83-
vm.stats.uploadId = reviewData.uploadId;
84-
vm.stats.createdAt = reviewData.createdAt;
85-
vm.stats.updatedAt = reviewData.updatedAt;
77+
vm.review = responses[1];
78+
vm.stats.submissionId = vm.review.submissionId;
79+
vm.stats.uploadId = vm.review.uploadId;
80+
vm.stats.createdAt = vm.review.createdAt;
81+
vm.stats.updatedAt = vm.review.updatedAt;
8682

87-
var scorecardData = response[3].data.result.content[0];
83+
var scorecardData = responses[2][0];
8884
var scorecardId = scorecardData.id;
8985

9086
ScorecardService.getScorecardQuestions(scorecardId)
91-
.then(function(data) {
92-
var questions = data.data.result.content;
87+
.then(function(questions) {
9388

9489
Helpers.storeById(vm.scorecard.questions, questions);
9590
Helpers.parseQuestions(vm.scorecard.questions);
9691

9792
return ReviewService.getReviewItems($stateParams.reviewId);
9893

9994
})
100-
.then(function(data) {
101-
var answers = data.data.result.content;
102-
95+
.then(function(answers) {
10396
vm.saved = Helpers.parseAnswers(vm.scorecard.questions, answers);
10497

10598
vm.loaded = true;

‎app/peer-review/review-status/review-status.controller.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020
ReviewService.getNextReview(vm.challengeId)
2121
.then(function(data) {
22-
var newReviewId = data.data.result.content;
22+
var newReviewId = data;
2323

2424
$state.go('review.edit', {
2525
challengeId: vm.challengeId,
@@ -38,19 +38,19 @@
3838
function activate() {
3939
ChallengeService.getChallengeDetails(vm.challengeId)
4040
.then(function(data) {
41-
vm.challenge = data.data;
41+
vm.challenge = data;
4242
});
4343

4444
ReviewService.getUsersPeerReviews(vm.challengeId)
4545
.then(function(data) {
46-
vm.reviews = data.data.result.content;
46+
vm.reviews = data;
4747
vm.completed = Helpers.countCompleted(vm.reviews);
4848
// Move calls to $q.all(), and move this to the success callback there
4949
vm.loaded = true;
5050
});
5151

52-
ChallengeService.getReviewEndDate(vm.challengeId).then(function(data) {
53-
vm.reviewsDue = data.data.result.content[0].scheduledEndTime;
52+
ChallengeService.getPhase(vm.challengeId, 'REVIEW').then(function(data) {
53+
vm.reviewsDue = data.scheduledEndTime;
5454
});
5555
}
5656
};

‎app/peer-review/review-status/review-status.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ describe('Review Status Controller', function() {
1515
getChallengeDetails: function() {
1616
return $q.when(challenge);
1717
},
18-
getReviewEndDate: function() {
18+
getPhase: function() {
1919
return $q.when(challengeDates);
2020
}
2121
};

‎app/services/challenge.service.js

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ import moment from 'moment'
77

88
angular.module('tc.services').factory('ChallengeService', ChallengeService)
99

10-
ChallengeService.$inject = ['CONSTANTS', 'ApiService', '$q']
10+
ChallengeService.$inject = ['CONSTANTS', 'ApiService', '$q', '$log']
1111

12-
function ChallengeService(CONSTANTS, ApiService, $q) {
12+
function ChallengeService(CONSTANTS, ApiService, $q, $log) {
1313
var api = ApiService.restangularV3
14-
14+
var apiV2 = ApiService.restangularV2
1515
var service = {
1616
getChallenges: getChallenges,
1717
getUserChallenges: getUserChallenges,
1818
getUserMarathonMatches: getUserMarathonMatches,
19-
getReviewEndDate: getReviewEndDate,
19+
getPhase: getPhase,
2020
getChallengeDetails: getChallengeDetails,
2121
processActiveDevDesignChallenges: processActiveDevDesignChallenges,
2222
processActiveMarathonMatches: processActiveMarathonMatches,
@@ -40,14 +40,24 @@ import moment from 'moment'
4040
return api.one('members', handle.toLowerCase()).all('mms').getList(params)
4141
}
4242

43-
function getReviewEndDate(challengeId) {
43+
function getPhase(challengeId, phaseType) {
4444
var url = CONSTANTS.API_URL + '/phases/?filter=' + encodeURIComponent('challengeId=' + challengeId + '&phaseType=4')
45-
return ApiService.requestHandler('GET', url)
45+
return api.one('challenges', challengeId).getList('phases').then(
46+
function(phases) {
47+
return _.find(phases, function(p) { return p.phaseType.toUpperCase() === phaseType});
48+
},
49+
function(err) {
50+
$log.error(err);
51+
}
52+
)
4653
}
4754

4855
function getChallengeDetails(challengeId) {
49-
var url = CONSTANTS.API_URL_V2 + '/challenges/' + challengeId
50-
return ApiService.requestHandler('GET', url, {}, true)
56+
// var url = CONSTANTS.API_URL_V2 + '/challenges/' + challengeId
57+
// return ApiService.requestHandler('GET', url, {}, true)
58+
return apiV2.one('challenges', challengeId).get().then(
59+
function(data) { return data.plain() }
60+
)
5161
}
5262

5363
function processActiveDevDesignChallenges(challenges) {

‎app/services/review.service.js

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
ReviewService.$inject = ['CONSTANTS', 'ApiService'];
77

88
function ReviewService(CONSTANTS, ApiService) {
9+
var api = ApiService.restangularV3
910
var service = {
1011
getUsersPeerReviews: getUsersPeerReviews,
1112
getReview: getReview,
@@ -19,39 +20,55 @@
1920
///////////////
2021

2122
function getUsersPeerReviews(challengeId) {
22-
var url = CONSTANTS.API_URL + '/reviews/?filter=' + encodeURIComponent('challengeId=' + challengeId);
23-
return ApiService.requestHandler('GET', url);
23+
// var url = CONSTANTS.API_URL + '/reviews/?filter=' + encodeURIComponent('challengeId=' + challengeId);
24+
var params = {
25+
filter: encodeURIComponent('challengeId='+challengeId)
26+
}
27+
return api.all('reviews').getList(params)
2428
}
2529

2630
function getReview(reviewId) {
27-
var url = CONSTANTS.API_URL + '/reviews/' + reviewId;
28-
return ApiService.requestHandler('GET', url);
31+
// var url = CONSTANTS.API_URL + '/reviews/' + reviewId;
32+
// return ApiService.requestHandler('GET', url);
33+
return api.one('reviews', reviewId).get()
2934
}
3035

3136
function getReviewItems(reviewId) {
32-
var url = CONSTANTS.API_URL + '/reviewItems/?filter=' + encodeURIComponent('reviewId=' + reviewId);
33-
return ApiService.requestHandler('GET', url);
37+
// var url = CONSTANTS.API_URL + '/reviewItems/?filter=' + encodeURIComponent('reviewId=' + reviewId);
38+
// return ApiService.requestHandler('GET', url);
39+
var params = {
40+
filter: encodeURIComponent('reviewId='+reviewId)
41+
}
42+
return api.all('reviewItems').getList(params)
3443
}
3544

3645
function getNextReview(challengeId) {
37-
var url = CONSTANTS.API_URL + '/reviews/' + challengeId + '/assignNextReview';
38-
return ApiService.requestHandler('PUT', url);
46+
// var url = CONSTANTS.API_URL + '/reviews/' + challengeId + '/assignNextReview';
47+
// return ApiService.requestHandler('PUT', url);
48+
return api.one('reviews', challengeId).customPUT(null, 'assignNextReview', null, null)
3949
}
4050

4151
function saveReviewItems(body, isPreviouslySaved) {
42-
var method = isPreviouslySaved ? 'PUT' : 'POST';
43-
var url = CONSTANTS.API_URL + '/reviewItems/';
44-
return ApiService.requestHandler(method, url, JSON.stringify(body));
52+
// var method = isPreviouslySaved ? 'PUT' : 'POST';
53+
// var url = CONSTANTS.API_URL + '/reviewItems/';
54+
// return ApiService.requestHandler(method, url, JSON.stringify(body));
55+
// body = JSON.stringify(body);
56+
if (isPreviouslySaved) {
57+
return api.all('reviewItems').customPUT(body, null, null, null)
58+
} else {
59+
return api.all('reivewItems').post(body)
60+
}
4561
}
4662

4763
function markAsCompleted(reviewId) {
48-
var url = CONSTANTS.API_URL + '/reviews/' + reviewId;
64+
// var url = CONSTANTS.API_URL + '/reviews/' + reviewId;
4965
var body = {
5066
committed: 1,
5167
id: reviewId
5268
};
5369

54-
return ApiService.requestHandler('PUT', url, JSON.stringify(body));
70+
// return ApiService.requestHandler('PUT', url, JSON.stringify(body));
71+
api.one('reviews', reviewId).put()
5572
}
5673
};
5774
})();

‎app/services/scorecard.service.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
ScorecardService.$inject = ['CONSTANTS', 'ApiService'];
77

88
function ScorecardService(CONSTANTS, ApiService) {
9+
var api = ApiService.restangularV3
910
var service = {
1011
getScorecardById: getScorecardById,
1112
getScorecard: getScorecard,
@@ -16,18 +17,15 @@
1617
///////////////
1718

1819
function getScorecardById(scorecardId) {
19-
var url = CONSTANTS.API_URL + '/scorecards/?filter=' + encodeURIComponent('scorecardId=' + scorecardId);
20-
return ApiService.requestHandler('GET', url);
20+
return api.all('scorecards').getList({filter: encodeURIComponent("scorecardId="+scorecardId)})
2121
}
2222

2323
function getScorecard(challengeId) {
24-
var url = CONSTANTS.API_URL + '/scorecards/?filter=' + encodeURIComponent('challengeId=' + challengeId);
25-
return ApiService.requestHandler('GET', url);
24+
return api.all('scorecards').getList({filter: encodeURIComponent("challengeId="+challengeId)})
2625
}
2726

2827
function getScorecardQuestions(scorecardId) {
29-
var url = CONSTANTS.API_URL + '/scorecardQuestions/?filter=' + encodeURIComponent('scorecardId=' + scorecardId);
30-
return ApiService.requestHandler('GET', url);
28+
return api.all('scorecardQuestions').getList({filter: encodeURIComponent("scorecardId="+scorecardId)})
3129
}
3230
};
3331
})();

0 commit comments

Comments
 (0)