mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-11 20:13:07 +00:00
dependency upgrades, server and platform module updates, linting wip
This commit is contained in:
William Welling
@@ -1,23 +1,24 @@
|
||||
import { COMMUNITIES } from "./communities";
|
||||
const util = require('util');
|
||||
const { Router } = require('express');
|
||||
const util = require('util');
|
||||
|
||||
// Our API for demos only
|
||||
import { fakeDataBase } from './db';
|
||||
import { fakeDemoRedisCache } from './cache';
|
||||
import { COLLECTIONS } from "./collections";
|
||||
import { ITEMS } from "./items";
|
||||
import { BUNDLES } from "./bundles";
|
||||
import { BITSTREAMS } from "./bitstreams";
|
||||
import { METADATA } from "./metadata";
|
||||
|
||||
import COMMUNITIES from './data/communities.json';
|
||||
import COLLECTIONS from './data/collections.json';
|
||||
import ITEMS from './data/items.json';
|
||||
import BUNDLES from './data/bundles.json';
|
||||
import BITSTREAMS from './data/bitstreams.json';
|
||||
import METADATA from './data/metadata.json';
|
||||
|
||||
// you would use cookies/token etc
|
||||
const USER_ID = 'f9d98cf1-1b96-464e-8755-bcc2a5c09077'; // hardcoded as an example
|
||||
|
||||
// Our API for demos only
|
||||
export function serverApi(req, res) {
|
||||
let key = USER_ID + '/data.json';
|
||||
let cache = fakeDemoRedisCache.get(key);
|
||||
const key = USER_ID + '/data.json';
|
||||
const cache = fakeDemoRedisCache.get(key);
|
||||
if (cache !== undefined) {
|
||||
console.log('/data.json Cache Hit');
|
||||
return res.json(cache);
|
||||
@@ -25,24 +26,23 @@ export function serverApi(req, res) {
|
||||
console.log('/data.json Cache Miss');
|
||||
|
||||
fakeDataBase.get()
|
||||
.then(data => {
|
||||
.then((data) => {
|
||||
fakeDemoRedisCache.set(key, data);
|
||||
return data;
|
||||
})
|
||||
.then(data => res.json(data));
|
||||
.then((data) => res.json(data));
|
||||
}
|
||||
|
||||
|
||||
function toHALResponse(req, data, included?) {
|
||||
let result = {
|
||||
"_embedded": data,
|
||||
"_links": {
|
||||
"self": req.protocol + '://' + req.get('host') + req.originalUrl
|
||||
const result = {
|
||||
_embedded: data,
|
||||
_links: {
|
||||
self: req.protocol + '://' + req.get('host') + req.originalUrl
|
||||
}
|
||||
};
|
||||
if (included && Array.isArray(included) && included.length > 0) {
|
||||
Object.assign(result, {
|
||||
"included": included
|
||||
included: included
|
||||
});
|
||||
}
|
||||
return result;
|
||||
@@ -50,39 +50,22 @@ function toHALResponse(req, data, included?) {
|
||||
|
||||
export function createMockApi() {
|
||||
|
||||
let router = Router();
|
||||
const router = Router();
|
||||
|
||||
router.route('/communities')
|
||||
.get(function(req, res) {
|
||||
console.log('GET');
|
||||
// 70ms latency
|
||||
setTimeout(function() {
|
||||
res.json(toHALResponse(req, COMMUNITIES));
|
||||
}, 0);
|
||||
router.route('/communities').get((req, res) => {
|
||||
console.log('GET');
|
||||
// 70ms latency
|
||||
setTimeout(() => {
|
||||
res.json(toHALResponse(req, COMMUNITIES));
|
||||
}, 0);
|
||||
});
|
||||
|
||||
// })
|
||||
// .post(function(req, res) {
|
||||
// console.log('POST', util.inspect(req.body, { colors: true }));
|
||||
// let community = req.body;
|
||||
// if (community) {
|
||||
// COMMUNITIES.push({
|
||||
// value: community.value,
|
||||
// created_at: new Date(),
|
||||
// completed: community.completed,
|
||||
// id: COMMUNITY_COUNT++
|
||||
// });
|
||||
// return res.json(community);
|
||||
// }
|
||||
//
|
||||
// return res.end();
|
||||
});
|
||||
|
||||
router.param('community_id', function(req, res, next, community_id) {
|
||||
router.param('community_id', (req, res, next, communityId) => {
|
||||
// ensure correct prop type
|
||||
let id = req.params.community_id;
|
||||
const id = req.params.community_id;
|
||||
try {
|
||||
req.community_id = id;
|
||||
req.community = COMMUNITIES["communities"].find((community) => {
|
||||
req.community = COMMUNITIES.communities.find((community) => {
|
||||
return community.id === id;
|
||||
});
|
||||
next();
|
||||
@@ -91,59 +74,24 @@ export function createMockApi() {
|
||||
}
|
||||
});
|
||||
|
||||
router.route('/communities/:community_id')
|
||||
.get(function(req, res) {
|
||||
// console.log('GET', util.inspect(req.community.id, { colors: true }));
|
||||
res.json(toHALResponse(req, req.community));
|
||||
// })
|
||||
// .put(function(req, res) {
|
||||
// console.log('PUT', util.inspect(req.body, { colors: true }));
|
||||
//
|
||||
// let index = COMMUNITIES.indexOf(req.community);
|
||||
// let community = COMMUNITIES[index] = req.body;
|
||||
//
|
||||
// res.json(community);
|
||||
// })
|
||||
// .delete(function(req, res) {
|
||||
// console.log('DELETE', req.community_id);
|
||||
//
|
||||
// let index = COMMUNITIES.indexOf(req.community);
|
||||
// COMMUNITIES.splice(index, 1);
|
||||
//
|
||||
// res.json(req.community);
|
||||
});
|
||||
router.route('/communities/:community_id').get((req, res) => {
|
||||
res.json(toHALResponse(req, req.community));
|
||||
});
|
||||
|
||||
router.route('/collections')
|
||||
.get(function(req, res) {
|
||||
console.log('GET');
|
||||
// 70ms latency
|
||||
setTimeout(function() {
|
||||
res.json(toHALResponse(req, COLLECTIONS));
|
||||
}, 0);
|
||||
router.route('/collections').get((req, res) => {
|
||||
console.log('GET');
|
||||
// 70ms latency
|
||||
setTimeout(() => {
|
||||
res.json(toHALResponse(req, COLLECTIONS));
|
||||
}, 0);
|
||||
});
|
||||
|
||||
// })
|
||||
// .post(function(req, res) {
|
||||
// console.log('POST', util.inspect(req.body, { colors: true }));
|
||||
// let collection = req.body;
|
||||
// if (collection) {
|
||||
// COLLECTIONS.push({
|
||||
// value: collection.value,
|
||||
// created_at: new Date(),
|
||||
// completed: collection.completed,
|
||||
// id: COLLECTION_COUNT++
|
||||
// });
|
||||
// return res.json(collection);
|
||||
// }
|
||||
//
|
||||
// return res.end();
|
||||
});
|
||||
|
||||
router.param('collection_id', function(req, res, next, collection_id) {
|
||||
router.param('collection_id', (req, res, next, collectionId) => {
|
||||
// ensure correct prop type
|
||||
let id = req.params.collection_id;
|
||||
const id = req.params.collection_id;
|
||||
try {
|
||||
req.collection_id = id;
|
||||
req.collection = COLLECTIONS["collections"].find((collection) => {
|
||||
req.collection = COLLECTIONS.collections.find((collection) => {
|
||||
return collection.id === id;
|
||||
});
|
||||
next();
|
||||
@@ -152,60 +100,24 @@ export function createMockApi() {
|
||||
}
|
||||
});
|
||||
|
||||
router.route('/collections/:collection_id')
|
||||
.get(function(req, res) {
|
||||
// console.log('GET', util.inspect(req.collection.id, { colors: true }));
|
||||
res.json(toHALResponse(req, req.collection));
|
||||
// })
|
||||
// .put(function(req, res) {
|
||||
// console.log('PUT', util.inspect(req.body, { colors: true }));
|
||||
//
|
||||
// let index = COLLECTIONS.indexOf(req.collection);
|
||||
// let collection = COLLECTIONS[index] = req.body;
|
||||
//
|
||||
// res.json(collection);
|
||||
// })
|
||||
// .delete(function(req, res) {
|
||||
// console.log('DELETE', req.collection_id);
|
||||
//
|
||||
// let index = COLLECTIONS.indexOf(req.collection);
|
||||
// COLLECTIONS.splice(index, 1);
|
||||
//
|
||||
// res.json(req.collection);
|
||||
});
|
||||
router.route('/collections/:collection_id').get((req, res) => {
|
||||
res.json(toHALResponse(req, req.collection));
|
||||
});
|
||||
|
||||
router.route('/items').get((req, res) => {
|
||||
console.log('GET');
|
||||
// 70ms latency
|
||||
setTimeout(() => {
|
||||
res.json(toHALResponse(req, ITEMS));
|
||||
}, 0);
|
||||
});
|
||||
|
||||
router.route('/items')
|
||||
.get(function(req, res) {
|
||||
console.log('GET');
|
||||
// 70ms latency
|
||||
setTimeout(function() {
|
||||
res.json(toHALResponse(req, ITEMS));
|
||||
}, 0);
|
||||
|
||||
// })
|
||||
// .post(function(req, res) {
|
||||
// console.log('POST', util.inspect(req.body, { colors: true }));
|
||||
// let item = req.body;
|
||||
// if (item) {
|
||||
// ITEMS.push({
|
||||
// value: item.value,
|
||||
// created_at: new Date(),
|
||||
// completed: item.completed,
|
||||
// id: ITEM_COUNT++
|
||||
// });
|
||||
// return res.json(item);
|
||||
// }
|
||||
//
|
||||
// return res.end();
|
||||
});
|
||||
|
||||
router.param('item_id', function(req, res, next, item_id) {
|
||||
router.param('item_id', (req, res, next, itemId) => {
|
||||
// ensure correct prop type
|
||||
let id = req.params.item_id;
|
||||
const id = req.params.item_id;
|
||||
try {
|
||||
req.item_id = id;
|
||||
req.item = ITEMS["items"].find((item) => {
|
||||
req.item = ITEMS.items.find((item) => {
|
||||
return item.id === id;
|
||||
});
|
||||
next();
|
||||
@@ -214,86 +126,63 @@ export function createMockApi() {
|
||||
}
|
||||
});
|
||||
|
||||
router.route('/items/:item_id')
|
||||
.get(function(req, res) {
|
||||
// console.log('GET', util.inspect(req.item, { colors: true }));
|
||||
res.json(toHALResponse(req, req.item));
|
||||
// })
|
||||
// .put(function(req, res) {
|
||||
// console.log('PUT', util.inspect(req.body, { colors: true }));
|
||||
//
|
||||
// let index = ITEMS.indexOf(req.item);
|
||||
// let item = ITEMS[index] = req.body;
|
||||
//
|
||||
// res.json(item);
|
||||
// })
|
||||
// .delete(function(req, res) {
|
||||
// console.log('DELETE', req.item_id);
|
||||
//
|
||||
// let index = ITEMS.indexOf(req.item);
|
||||
// ITEMS.splice(index, 1);
|
||||
//
|
||||
// res.json(req.item);
|
||||
});
|
||||
router.route('/items/:item_id').get((req, res) => {
|
||||
res.json(toHALResponse(req, req.item));
|
||||
});
|
||||
|
||||
router.route('/bundles')
|
||||
.get(function(req, res) {
|
||||
console.log('GET');
|
||||
// 70ms latency
|
||||
setTimeout(function() {
|
||||
res.json(toHALResponse(req, BUNDLES));
|
||||
}, 0);
|
||||
});
|
||||
router.route('/bundles').get((req, res) => {
|
||||
console.log('GET');
|
||||
// 70ms latency
|
||||
setTimeout(() => {
|
||||
res.json(toHALResponse(req, BUNDLES));
|
||||
}, 0);
|
||||
});
|
||||
|
||||
router.param('bundle_id', function(req, res, next, bundle_id) {
|
||||
// ensure correct prop type
|
||||
let id = req.params.bundle_id;
|
||||
try {
|
||||
req.bundle_id = id;
|
||||
req.bundle = BUNDLES["bundles"].find((bundle) => {
|
||||
return bundle.id === id;
|
||||
});
|
||||
next();
|
||||
} catch (e) {
|
||||
next(new Error('failed to load item'));
|
||||
}
|
||||
});
|
||||
router.param('bundle_id', (req, res, next, bundleId) => {
|
||||
// ensure correct prop type
|
||||
const id = req.params.bundle_id;
|
||||
try {
|
||||
req.bundle_id = id;
|
||||
req.bundle = BUNDLES.bundles.find((bundle) => {
|
||||
return bundle.id === id;
|
||||
});
|
||||
next();
|
||||
} catch (e) {
|
||||
next(new Error('failed to load item'));
|
||||
}
|
||||
});
|
||||
|
||||
router.route('/bundles/:bundle_id')
|
||||
.get(function(req, res) {
|
||||
// console.log('GET', util.inspect(req.bundle, { colors: true }));
|
||||
res.json(toHALResponse(req, req.bundle));
|
||||
});
|
||||
router.route('/bundles/:bundle_id').get((req, res) => {
|
||||
// console.log('GET', util.inspect(req.bundle, { colors: true }));
|
||||
res.json(toHALResponse(req, req.bundle));
|
||||
});
|
||||
|
||||
router.route('/bitstreams').get((req, res) => {
|
||||
console.log('GET');
|
||||
// 70ms latency
|
||||
setTimeout(() => {
|
||||
res.json(toHALResponse(req, BITSTREAMS));
|
||||
}, 0);
|
||||
});
|
||||
|
||||
router.route('/bitstreams')
|
||||
.get(function(req, res) {
|
||||
console.log('GET');
|
||||
// 70ms latency
|
||||
setTimeout(function() {
|
||||
res.json(toHALResponse(req, BITSTREAMS));
|
||||
}, 0);
|
||||
});
|
||||
router.param('bitstream_id', (req, res, next, bitstreamId) => {
|
||||
// ensure correct prop type
|
||||
const id = req.params.bitstream_id;
|
||||
try {
|
||||
req.bitstream_id = id;
|
||||
req.bitstream = BITSTREAMS.bitstreams.find((bitstream) => {
|
||||
return bitstream.id === id;
|
||||
});
|
||||
next();
|
||||
} catch (e) {
|
||||
next(new Error('failed to load item'));
|
||||
}
|
||||
});
|
||||
|
||||
router.param('bitstream_id', function(req, res, next, bitstream_id) {
|
||||
// ensure correct prop type
|
||||
let id = req.params.bitstream_id;
|
||||
try {
|
||||
req.bitstream_id = id;
|
||||
req.bitstream = BITSTREAMS["bitstreams"].find((bitstream) => {
|
||||
return bitstream.id === id;
|
||||
});
|
||||
next();
|
||||
} catch (e) {
|
||||
next(new Error('failed to load item'));
|
||||
}
|
||||
});
|
||||
|
||||
router.route('/bitstreams/:bitstream_id')
|
||||
.get(function(req, res) {
|
||||
// console.log('GET', util.inspect(req.bitstream, { colors: true }));
|
||||
res.json(toHALResponse(req, req.bitstream));
|
||||
});
|
||||
router.route('/bitstreams/:bitstream_id').get((req, res) => {
|
||||
// console.log('GET', util.inspect(req.bitstream, { colors: true }));
|
||||
res.json(toHALResponse(req, req.bitstream));
|
||||
});
|
||||
|
||||
return router;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user