yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Renamed Document#atlasId finally"

Browse Source
This commit is contained in:
Jori Lallo
2018-02-07 11:32:18 -08:00
committed by GitHub
parent 1e05189bc9
commit c92697a8a8
8 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/api/documents.js
View File

@@ -20,7 +20,7 @@ router.post('documents.list', auth(), pagination(), async ctx => {
const user = ctx.state.user;
let where = { teamId: user.teamId };
if (collection) where = { ...where, collectionId: collection };
if (collection) where = { ...where, atlasId: collection };
const userId = user.id;
const starredScope = { method: ['withStarred', userId] };
@@ -215,7 +215,7 @@ router.post('documents.create', auth(), async ctx => {
parentDocumentObj = await Document.findOne({
where: {
id: parentDocument,
collectionId: ownerCollection.id,
atlasId: ownerCollection.id,
},
});
if (!parentDocumentObj)
@@ -224,7 +224,7 @@ router.post('documents.create', auth(), async ctx => {
const newDocument = await Document.create({
parentDocumentId: parentDocumentObj.id,
collectionId: ownerCollection.id,
atlasId: ownerCollection.id,
teamId: user.teamId,
userId: user.id,
lastModifiedById: user.id,
@@ -287,7 +287,7 @@ router.post('documents.move', auth(), async ctx => {
if (index) ctx.assertPositiveInteger(index, 'index must be an integer (>=0)');
const document = await Document.findById(id);
const collection = await Collection.findById(document.collectionId);
const collection = await Collection.findById(document.atlasId);
authDocumentForUser(ctx, document);
@@ -297,7 +297,7 @@ router.post('documents.move', auth(), async ctx => {
// Set parent document
if (parentDocument) {
const parent = await Document.findById(parentDocument);
if (!parent || parent.collectionId !== document.collectionId)
if (!parent || parent.atlasId !== document.atlasId)
throw httpErrors.BadRequest(
'Invalid parentDocument (must be same collection)'
);
@@ -324,7 +324,7 @@ router.post('documents.delete', auth(), async ctx => {
ctx.assertPresent(id, 'id is required');
const document = await Document.findById(id);
const collection = await Collection.findById(document.collectionId);
const collection = await Collection.findById(document.atlasId);
authDocumentForUser(ctx, document);

2
server/api/documents.test.js
View File

@@ -37,7 +37,7 @@ describe('#documents.list', async () => {
it('should allow filtering by collection', async () => {
const { user, document } = await seed();
const res = await server.post('/api/documents.list', {
body: { token: user.getJwtToken(), collection: document.collectionId },
body: { token: user.getJwtToken(), collection: document.atlasId },
});
const body = await res.json();