Ryan/docmost-ryan
1
0
Fork 0
mirror of https://github.com/Shadowfita/docmost.git synced 2025-11-19 11:11:05 +10:00
Code Issues Packages Projects Releases Wiki Activity

* Fixes

Browse Source 
* use lower case db column names
* fix signup workspaceId
This commit is contained in:
Philipinho
2024-03-29 16:25:42 +00:00
parent 82da4ffdc2
commit b241523ff6
25 changed files with 248 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/server/src/core/page/page.util.ts
View File

@ -64,7 +64,7 @@ export async function removeFromArrayAndSave(
if (index > -1) {
array.splice(index, 1);
await trx
.updateTable('page_ordering')
.updateTable('pageOrdering')
.set(entity)
.where('id', '=', entity.id)
.execute();

12
apps/server/src/core/page/services/page-ordering.service.ts
View File

@ -62,7 +62,7 @@ export class PageOrderingService {
// it should save or update right?
// await manager.save(spaceOrdering); //TODO: to update or create new record? pretty confusing
await trx
.updateTable('page_ordering')
.updateTable('pageOrdering')
.set(spaceOrdering)
.where('id', '=', spaceOrdering.id)
.execute();
@ -109,7 +109,7 @@ export class PageOrderingService {
// Modify the children list of the new parentPage and save
orderPageList(parentPageOrdering.childrenIds, dto);
await trx
.updateTable('page_ordering')
.updateTable('pageOrdering')
.set(parentPageOrdering)
.where('id', '=', parentPageOrdering.id)
.execute();
@ -238,7 +238,7 @@ export class PageOrderingService {
if (!ordering.childrenIds.includes(childId)) {
ordering.childrenIds.unshift(childId);
await trx
.updateTable('page_ordering')
.updateTable('pageOrdering')
.set(ordering)
.where('id', '=', ordering.id)
.execute();
@ -252,7 +252,7 @@ export class PageOrderingService {
trx: KyselyTransaction,
): Promise<PageOrdering> {
return trx
.selectFrom('page_ordering')
.selectFrom('pageOrdering')
.selectAll()
.where('entityId', '=', entityId)
.where('entityType', '=', entityType)
@ -267,7 +267,7 @@ export class PageOrderingService {
trx: KyselyTransaction,
): Promise<PageOrdering> {
await trx
.insertInto('page_ordering')
.insertInto('pageOrdering')
.values({
entityId,
entityType,
@ -285,7 +285,7 @@ export class PageOrderingService {
spaceId: string,
): Promise<{ id: string; childrenIds: string[]; spaceId: string }> {
return await this.db
.selectFrom('page_ordering')
.selectFrom('pageOrdering')
.select(['id', 'childrenIds', 'spaceId'])
.where('entityId', '=', spaceId)
.where('entityType', '=', OrderingEntity.SPACE)