Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-18 05:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

LH :: Fix bug with mock-data loading due to timing

Browse source
This commit is contained in:
Lim Han 2015-02-08 18:15:54 +08:00
parent 16bbf17d98
commit 202d4fdcef
2 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/webapp/js/app.js
View file

@ -2,7 +2,7 @@ var app = angular.module('spring-petclinic', ['ui.router','ui.router.stateHelper
/** Start of Configurable constants **/ /** Start of Configurable constants **/
app.constant('useMockData', true); app.constant('useMockData', false);
app.constant('context', '/petclinic'); app.constant('context', '/petclinic');
/** End of Configurable constants **/ /** End of Configurable constants **/

38
src/main/webapp/services/services.js
View file

@ -18,28 +18,36 @@ var Visit = ['$resource','context', function($resource, context) {
return $resource(context + '/api/pets/:petId/visits', {petId : '@id'}); return $resource(context + '/api/pets/:petId/visits', {petId : '@id'});
}]; }];
var MockService = ['$httpBackend', '$http', 'context', function($httpBackend, $http, context) { var MockService = ['$httpBackend', '$http', '$q', 'context', function($httpBackend, $http, $q, context) {
return { return {
mock : function(useMockData) { mock : function(useMockData) {
if(useMockData) { var passThroughRegex = new RegExp('/static/mock-data/|components/');
$http.get(context + '/static/mock-data/pets.json').success(function(data) { $httpBackend.whenGET(passThroughRegex).passThrough();
console.log("Mocking /api/pets");
$httpBackend.whenGET(context + '/api/pets').respond(data);
});
$http.get(context + '/static/mock-data/vets.json').success(function(data) {
console.log("Mocking /api/vets");
$httpBackend.whenGET(context + '/api/vets').respond(data);
});
$http.get(context + '/static/mock-data/owners.json').success(function(data) {
console.log("Mocking /api/owners");
$httpBackend.whenGET(context + '/api/owners').respond(data);
});
}
if(useMockData) {
$q.defer();
$q.all([
$http.get(context + '/static/mock-data/pets.json'),
$http.get(context + '/static/mock-data/vets.json'),
$http.get(context + '/static/mock-data/owners.json')
]).then(function(data) {
console.log("Mocking /api/pets");
$httpBackend.whenGET(context + '/api/pets').respond(data[0].data);
console.log("Mocking /api/vets");
$httpBackend.whenGET(context + '/api/vets').respond(data[1].data);
console.log("Mocking /api/owners");
$httpBackend.whenGET(context + '/api/owners').respond(data[2].data);
console.log("Setting up passthrough for other urls");
var passThroughRegex = new RegExp('/');
$httpBackend.whenGET(passThroughRegex).passThrough();
});
} else {
console.log("Setting up passthrough for other urls"); console.log("Setting up passthrough for other urls");
var passThroughRegex = new RegExp('/'); var passThroughRegex = new RegExp('/');
$httpBackend.whenGET(passThroughRegex).passThrough(); $httpBackend.whenGET(passThroughRegex).passThrough();
} }
} }
}
}]; }];