github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-30 20:28:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'relational-updates' of https://github.com/directus/next into relational-updates

Browse Source
This commit is contained in:
Nitwel
2020-10-14 19:37:38 +02:00
parent 54e9165d32 191e1187fb
commit 36b0599544
2 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/services/items.ts
View File

@@ -439,8 +439,8 @@ export class ItemsService implements AbstractService {
return await this.update(data, keys);
}
upsert(data: Partial<Item>): Promise<PrimaryKey>;
upsert(data: Partial<Item>[]): Promise<PrimaryKey[]>;
upsert(data: Partial<Item>): Promise<PrimaryKey>;
async upsert(data: Partial<Item> | Partial<Item>[]): Promise<PrimaryKey | PrimaryKey[]> {
const primaryKeyField = await this.schemaInspector.primary(this.collection);
const payloads = Array.isArray(data) ? data : [data];

57
api/src/services/payload.ts
View File

@@ -347,10 +347,7 @@ export class PayloadService {
const relationsToProcess = relations.filter((relation) => {
if (!relation.one_field) return false;
return (
payload.hasOwnProperty(relation.one_field) &&
Array.isArray(payload[relation.one_field])
);
return payload.hasOwnProperty(relation.one_field);
});
for (const relation of relationsToProcess) {
@@ -360,37 +357,43 @@ export class PayloadService {
});
const relatedRecords: Partial<Item>[] = [];
let savedPrimaryKeys: PrimaryKey[] = [];
for (const relatedRecord of payload[relation.one_field!]) {
let record = cloneDeep(relatedRecord);
if (payload[relation.one_field!] && Array.isArray(payload[relation.one_field!])) {
for (const relatedRecord of payload[relation.one_field!] || []) {
let record = cloneDeep(relatedRecord);
if (typeof relatedRecord === 'string' || typeof relatedRecord === 'number') {
const exists = !!(await this.knex
.select(relation.many_primary)
.from(relation.many_collection)
.where({ [relation.many_primary]: record })
.first());
if (
typeof relatedRecord === 'string' ||
typeof relatedRecord === 'number'
) {
const exists = !!(await this.knex
.select(relation.many_primary)
.from(relation.many_collection)
.where({ [relation.many_primary]: record })
.first());
if (exists === false) {
throw new ForbiddenException(undefined, {
item: record,
collection: relation.many_collection,
});
if (exists === false) {
throw new ForbiddenException(undefined, {
item: record,
collection: relation.many_collection,
});
}
record = {
[relation.many_primary]: relatedRecord,
};
}
record = {
[relation.many_primary]: relatedRecord,
};
relatedRecords.push({
...record,
[relation.many_field]: parent || payload[relation.one_primary!],
});
}
relatedRecords.push({
...record,
[relation.many_field]: parent || payload[relation.one_primary!],
});
savedPrimaryKeys = await itemsService.upsert(relatedRecords);
}
const primaryKeys = await itemsService.upsert(relatedRecords);
await itemsService.updateByQuery(
{ [relation.many_field]: null },
{
@@ -403,7 +406,7 @@ export class PayloadService {
},
{
[relation.many_primary]: {
_nin: primaryKeys,
_nin: savedPrimaryKeys,
},
},
],