Add get user shelves from db:
Add GET /api/shelves/get endpoint; Turn off test data and pull shelves from database; Update getLastUpdatedTimestamp to use association function.
This commit is contained in:
parent
cf691f5cff
commit
aefab612e7
|
@ -27,13 +27,8 @@ export class ShelvesController extends ViewController {
|
|||
}
|
||||
|
||||
getUserShelves () {
|
||||
return Promise.resolve([
|
||||
{id:1,name:'Test Shelf',isDeletable:false,isPublilc:false},
|
||||
{id:2,name:'Deletable Shelf',isDeletable:true,isPublilc:false},
|
||||
{id:3,name:'Public Shelf',isDeletable:true,isPublilc:true},
|
||||
]).then(shelves => {
|
||||
return fetch('/api/shelves/get').then(response => response.json()).then(shelves => {
|
||||
this.state.myShelves = shelves;
|
||||
});
|
||||
// return fetch('/api/shelves/get').then(response => response.json);
|
||||
}
|
||||
}
|
|
@ -21,7 +21,7 @@ export const userShelvesView = (shelvesController, emit) => {
|
|||
}
|
||||
|
||||
if (shelvesController.state.myShelves.length <= 0) {
|
||||
shelvesController.getUserShelves().then(result => {
|
||||
shelvesController.getUserShelves().then(() => {
|
||||
emit('render');
|
||||
});
|
||||
}
|
||||
|
|
|
@ -93,20 +93,18 @@ class ShelfController {
|
|||
}
|
||||
|
||||
async getLastUpdatedTimestamp (shelf) {
|
||||
const lastEditedItem = await this.itemModel.findOne({
|
||||
const lastEditedItem = await shelf.getShelfItems({
|
||||
attributes: ['updatedAt'],
|
||||
where: {
|
||||
shelf: shelf.id,
|
||||
},
|
||||
order: [
|
||||
[
|
||||
'updatedAt',
|
||||
'DESC'
|
||||
],
|
||||
],
|
||||
limit: 1,
|
||||
});
|
||||
|
||||
if (lastEditedItem && lastEditedItem.updatedAt > shelf.updatedAt) {
|
||||
if (lastEditedItem.length > 0 && (lastEditedItem[0].updatedAt > shelf.updatedAt)) {
|
||||
return lastEditedItem.updatedAt;
|
||||
}
|
||||
return shelf.updatedAt;
|
||||
|
|
|
@ -7,7 +7,7 @@ async function routes(fastify, options) {
|
|||
return false;
|
||||
});
|
||||
|
||||
fastify.post('/api/shelves/get', async (request, reply) => {
|
||||
fastify.get('/api/shelves/get', async (request, reply) => {
|
||||
if (!request.isLoggedInUser) {
|
||||
return reply.code(400).send({
|
||||
error: true,
|
||||
|
@ -15,8 +15,15 @@ async function routes(fastify, options) {
|
|||
});
|
||||
}
|
||||
|
||||
return request.user.getShelves({
|
||||
attributes: ['id', 'name', 'isDeletable', 'isPublic'],
|
||||
const shelfController = new ShelfController(fastify.models.Shelf, fastify.models.ShelfItem);
|
||||
|
||||
const shelves = await request.user.getShelves({
|
||||
attributes: ['id', 'name', 'isDeletable', 'isPublic', 'updatedAt'],
|
||||
});
|
||||
|
||||
return shelves.map(shelf => {
|
||||
shelf.updatedAt = shelfController.getLastUpdatedTimestamp(shelf);
|
||||
return shelf;
|
||||
});
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in New Issue