Skip to content

Commit

Permalink
feat: support hasMany and manyToMany between models with composite keys
Browse files Browse the repository at this point in the history
  • Loading branch information
@hein-j
Hein Jeong authored and hein-j committed Dec 14, 2022
1 parent 13d8117 commit bd65d82
Show file tree
Hide file tree
Showing 16 changed files with 337 additions and 281 deletions.
118 changes: 77 additions & 41 deletions ...s/codegen-ui-react/lib/__tests__/__snapshots__/studio-ui-codegen-react-forms.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2699,17 +2699,19 @@ export default function UpdateCompositeDogForm(props) {
const compositeToysToUnLink = [];
const compositeToysSet = new Set();
const linkedCompositeToysSet = new Set();
CompositeToys.forEach((r) => compositeToysSet.add(r.kind));
CompositeToys.forEach((r) =>
compositeToysSet.add(getIDValue.CompositeToys?.(r))
);
linkedCompositeToys.forEach((r) =>
linkedCompositeToysSet.add(r.kind)
linkedCompositeToysSet.add(getIDValue.CompositeToys?.(r))
);
linkedCompositeToys.forEach((r) => {
if (!compositeToysSet.has(r.id)) {
if (!compositeToysSet.has(getIDValue.CompositeToys?.(r))) {
compositeToysToUnLink.push(r);
}
});
CompositeToys.forEach((r) => {
if (!linkedCompositeToysSet.has(r.id)) {
if (!linkedCompositeToysSet.has(getIDValue.CompositeToys?.(r))) {
compositeToysToLink.push(r);
}
});
Expand All @@ -2718,6 +2720,7 @@ export default function UpdateCompositeDogForm(props) {
DataStore.save(
CompositeToy.copyOf(original, (updated) => {
updated.compositeDogCompositeToysName = null;
updated.compositeDogCompositeToysDescription = null;
})
)
);
Expand All @@ -2728,6 +2731,8 @@ export default function UpdateCompositeDogForm(props) {
CompositeToy.copyOf(original, (updated) => {
updated.compositeDogCompositeToysName =
compositeDogRecord.name;
updated.compositeDogCompositeToysDescription =
compositeDogRecord.description;
})
)
);
Expand All @@ -2737,14 +2742,16 @@ export default function UpdateCompositeDogForm(props) {
const compositeVetsMap = new Map();
const linkedCompositeVetsMap = new Map();
CompositeVets.forEach((r) => {
const count = compositeVetsMap.get(r.specialty);
const count = compositeVetsMap.get(getIDValue.CompositeVets?.(r));
const newCount = count ? count + 1 : 1;
compositeVetsMap.set(r.specialty, newCount);
compositeVetsMap.set(getIDValue.CompositeVets?.(r), newCount);
});
linkedCompositeVets.forEach((r) => {
const count = linkedCompositeVetsMap.get(r.specialty);
const count = linkedCompositeVetsMap.get(
getIDValue.CompositeVets?.(r)
);
const newCount = count ? count + 1 : 1;
linkedCompositeVetsMap.set(r.specialty, newCount);
linkedCompositeVetsMap.set(getIDValue.CompositeVets?.(r), newCount);
});
linkedCompositeVetsMap.forEach((count, id) => {
const newCount = compositeVetsMap.get(id);
Expand Down Expand Up @@ -2772,10 +2779,17 @@ export default function UpdateCompositeDogForm(props) {
const compositeDogCompositeVetRecords = await DataStore.query(
CompositeDogCompositeVet,
(r) =>
r.and((r) => [
r.compositeVetID.eq(id),
r.compositeDogID.eq(compositeDogRecord.name),
])
r.and((r) => {
const recordKeys = JSON.parse(id);
return [
r.compositeVetSpecialty.eq(recordKeys.specialty),
r.compositeVetcity.eq(recordKeys.city),
r.compositeDogName.eq(compositeDogRecord.name),
r.compositeDogdescription.eq(
compositeDogRecord.description
),
];
})
);
for (let i = 0; i < count; i++) {
promises.push(
Expand All @@ -2788,8 +2802,12 @@ export default function UpdateCompositeDogForm(props) {
promises.push(
DataStore.save(
new CompositeDogCompositeVet({
compositeDogID: compositeDogRecord.name,
compositeVetID: id,
compositeDog: compositeDogRecord,
compositeVet: compositeVetRecords.find((r) =>
Object.entries(JSON.parse(id)).every(
([key, value]) => r[key] === value
)
),
})
)
);
Expand Down Expand Up @@ -2826,7 +2844,7 @@ export default function UpdateCompositeDogForm(props) {
<TextField
label=\\"Name\\"
isRequired={true}
isReadOnly={false}
isReadOnly={true}
defaultValue={name}
onChange={(e) => {
let { value } = e.target;
Expand Down Expand Up @@ -2855,7 +2873,7 @@ export default function UpdateCompositeDogForm(props) {
<TextField
label=\\"Description\\"
isRequired={true}
isReadOnly={false}
isReadOnly={true}
defaultValue={description}
onChange={(e) => {
let { value } = e.target;
Expand Down Expand Up @@ -3655,14 +3673,14 @@ export default function UpdateCPKTeacherForm(props) {
const cPKClassesMap = new Map();
const linkedCPKClassesMap = new Map();
CPKClasses.forEach((r) => {
const count = cPKClassesMap.get(r.specialClassId);
const count = cPKClassesMap.get(getIDValue.CPKClasses?.(r));
const newCount = count ? count + 1 : 1;
cPKClassesMap.set(r.specialClassId, newCount);
cPKClassesMap.set(getIDValue.CPKClasses?.(r), newCount);
});
linkedCPKClasses.forEach((r) => {
const count = linkedCPKClassesMap.get(r.specialClassId);
const count = linkedCPKClassesMap.get(getIDValue.CPKClasses?.(r));
const newCount = count ? count + 1 : 1;
linkedCPKClassesMap.set(r.specialClassId, newCount);
linkedCPKClassesMap.set(getIDValue.CPKClasses?.(r), newCount);
});
linkedCPKClassesMap.forEach((count, id) => {
const newCount = cPKClassesMap.get(id);
Expand Down Expand Up @@ -3690,10 +3708,13 @@ export default function UpdateCPKTeacherForm(props) {
const cPKTeacherCPKClassRecords = await DataStore.query(
CPKTeacherCPKClass,
(r) =>
r.and((r) => [
r.cpkClassID.eq(id),
r.cpkTeacherID.eq(cPKTeacherRecord.specialTeacherId),
])
r.and((r) => {
const recordKeys = JSON.parse(id);
return [
r.cpkClassID.eq(recordKeys.specialClassId),
r.cpkTeacherID.eq(cPKTeacherRecord.specialTeacherId),
];
})
);
for (let i = 0; i < count; i++) {
promises.push(DataStore.delete(cPKTeacherCPKClassRecords[i]));
Expand All @@ -3704,8 +3725,12 @@ export default function UpdateCPKTeacherForm(props) {
promises.push(
DataStore.save(
new CPKTeacherCPKClass({
cpkTeacherID: cPKTeacherRecord.specialTeacherId,
cpkClassID: id,
cpkTeacher: cPKTeacherRecord,
cpkClass: cPKClassRecords.find((r) =>
Object.entries(JSON.parse(id)).every(
([key, value]) => r[key] === value
)
),
})
)
);
Expand All @@ -3715,17 +3740,19 @@ export default function UpdateCPKTeacherForm(props) {
const cPKProjectsToUnLink = [];
const cPKProjectsSet = new Set();
const linkedCPKProjectsSet = new Set();
CPKProjects.forEach((r) => cPKProjectsSet.add(r.specialProjectId));
CPKProjects.forEach((r) =>
cPKProjectsSet.add(getIDValue.CPKProjects?.(r))
);
linkedCPKProjects.forEach((r) =>
linkedCPKProjectsSet.add(r.specialProjectId)
linkedCPKProjectsSet.add(getIDValue.CPKProjects?.(r))
);
linkedCPKProjects.forEach((r) => {
if (!cPKProjectsSet.has(r.id)) {
if (!cPKProjectsSet.has(getIDValue.CPKProjects?.(r))) {
cPKProjectsToUnLink.push(r);
}
});
CPKProjects.forEach((r) => {
if (!linkedCPKProjectsSet.has(r.id)) {
if (!linkedCPKProjectsSet.has(getIDValue.CPKProjects?.(r))) {
cPKProjectsToLink.push(r);
}
});
Expand Down Expand Up @@ -9743,15 +9770,17 @@ export default function SchoolUpdateForm(props) {
const studentsToUnLink = [];
const studentsSet = new Set();
const linkedStudentsSet = new Set();
Students.forEach((r) => studentsSet.add(r.id));
linkedStudents.forEach((r) => linkedStudentsSet.add(r.id));
Students.forEach((r) => studentsSet.add(getIDValue.Students?.(r)));
linkedStudents.forEach((r) =>
linkedStudentsSet.add(getIDValue.Students?.(r))
);
linkedStudents.forEach((r) => {
if (!studentsSet.has(r.id)) {
if (!studentsSet.has(getIDValue.Students?.(r))) {
studentsToUnLink.push(r);
}
});
Students.forEach((r) => {
if (!linkedStudentsSet.has(r.id)) {
if (!linkedStudentsSet.has(getIDValue.Students?.(r))) {
studentsToLink.push(r);
}
});
Expand Down Expand Up @@ -10772,14 +10801,14 @@ export default function TagUpdateForm(props) {
const postsMap = new Map();
const linkedPostsMap = new Map();
Posts.forEach((r) => {
const count = postsMap.get(r.id);
const count = postsMap.get(getIDValue.Posts?.(r));
const newCount = count ? count + 1 : 1;
postsMap.set(r.id, newCount);
postsMap.set(getIDValue.Posts?.(r), newCount);
});
linkedPosts.forEach((r) => {
const count = linkedPostsMap.get(r.id);
const count = linkedPostsMap.get(getIDValue.Posts?.(r));
const newCount = count ? count + 1 : 1;
linkedPostsMap.set(r.id, newCount);
linkedPostsMap.set(getIDValue.Posts?.(r), newCount);
});
linkedPostsMap.forEach((count, id) => {
const newCount = postsMap.get(id);
Expand All @@ -10805,7 +10834,10 @@ export default function TagUpdateForm(props) {
});
postsToUnLinkMap.forEach(async (count, id) => {
const tagPostRecords = await DataStore.query(TagPost, (r) =>
r.and((r) => [r.postID.eq(id), r.tagID.eq(tagRecord.id)])
r.and((r) => {
const recordKeys = JSON.parse(id);
return [r.postID.eq(recordKeys.id), r.tagID.eq(tagRecord.id)];
})
);
for (let i = 0; i < count; i++) {
promises.push(DataStore.delete(tagPostRecords[i]));
Expand All @@ -10816,8 +10848,12 @@ export default function TagUpdateForm(props) {
promises.push(
DataStore.save(
new TagPost({
tagID: tagRecord.id,
postID: id,
tag: tagRecord,
post: postRecords.find((r) =>
Object.entries(JSON.parse(id)).every(
([key, value]) => r[key] === value
)
),
})
)
);
Expand Down
4 changes: 3 additions & 1 deletion packages/codegen-ui-react/lib/__tests__/__utils__/mock-data-schemas.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export const authorHasManySchema: GenericDataSchema = {
dataSourceType: 'DataStore',
models: {
Book: {
primaryKeys: ['id'],
fields: {
id: {
dataType: 'ID',
Expand Down Expand Up @@ -69,6 +70,7 @@ export const authorHasManySchema: GenericDataSchema = {
},
},
Author: {
primaryKeys: ['id'],
fields: {
id: {
dataType: 'ID',
Expand Down Expand Up @@ -104,7 +106,7 @@ export const authorHasManySchema: GenericDataSchema = {
relationship: {
type: 'HAS_MANY',
relatedModelName: 'Book',
relatedModelField: 'authorID',
relatedModelFields: ['authorID'],
},
},
createdAt: {
Expand Down
14 changes: 7 additions & 7 deletions packages/codegen-ui-react/lib/__tests__/studio-ui-codegen-react-forms.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,16 +389,16 @@ describe('amplify form renderer tests', () => {
expect(componentText).toContain('JSON.stringify({ specialStudentId: r?.specialStudentId })');

// manyToMany
expect(componentText).toContain('const count = cPKClassesMap.get(r.specialClassId)');
expect(componentText).toContain('cPKClassesMap.set(r.specialClassId, newCount)');
expect(componentText).toContain('const count = linkedCPKClassesMap.get(r.specialClassId)');
expect(componentText).toContain('linkedCPKClassesMap.set(r.specialClassId, newCount)');
expect(componentText).toContain('const count = cPKClassesMap.get(getIDValue.CPKClasses?.(r))');
expect(componentText).toContain('cPKClassesMap.set(getIDValue.CPKClasses?.(r), newCount)');
expect(componentText).toContain('const count = linkedCPKClassesMap.get(getIDValue.CPKClasses?.(r))');
expect(componentText).toContain('linkedCPKClassesMap.set(getIDValue.CPKClasses?.(r), newCount)');
expect(componentText).toContain('r.cpkTeacherID.eq(cPKTeacherRecord.specialTeacherId)');
expect(componentText).toContain('cpkTeacherID: cPKTeacherRecord.specialTeacherId');
expect(componentText).toContain('cpkTeacher: cPKTeacherRecord');

// hasMany
expect(componentText).toContain('CPKProjects.forEach((r) => cPKProjectsSet.add(r.specialProjectId))');
expect(componentText).toContain('linkedCPKProjectsSet.add(r.specialProjectId)');
expect(componentText).toContain('cPKProjectsSet.add(getIDValue.CPKProjects?.(r)');
expect(componentText).toContain('linkedCPKProjectsSet.add(getIDValue.CPKProjects?.(r))');
expect(componentText).toContain('updated.cPKTeacherID = cPKTeacherRecord.specialTeacherId');

expect(componentText).toMatchSnapshot();
Expand Down
9 changes: 4 additions & 5 deletions packages/codegen-ui-react/lib/amplify-ui-renderers/form.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,9 @@ export default class FormRenderer extends ReactComponentRenderer<BaseComponentPr
];
}
if (dataSourceType === 'DataStore') {
const primaryKey = this.componentMetadata.dataSchemaMetadata?.models[dataTypeName].primaryKey;

if (!primaryKey) {
throw new InternalError(`Could not find primary key for ${dataTypeName}`);
const { dataSchemaMetadata } = this.componentMetadata;
if (!dataSchemaMetadata) {
throw new InternalError(`Could not find data schema for data-backed form`);
}
return [
factory.createIfStatement(
Expand Down Expand Up @@ -144,7 +143,7 @@ export default class FormRenderer extends ReactComponentRenderer<BaseComponentPr
dataTypeName,
importedModelName,
formMetadata.fieldConfigs,
primaryKey,
dataSchemaMetadata,
),
// call onSuccess hook if it exists
factory.createIfStatement(
Expand Down
11 changes: 7 additions & 4 deletions packages/codegen-ui-react/lib/forms/form-renderer-helper/cta-props.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
import { FieldConfigMetadata } from '@aws-amplify/codegen-ui/lib/types';
import { FieldConfigMetadata, GenericDataSchema } from '@aws-amplify/codegen-ui';
import {
factory,
NodeFlags,
Expand Down Expand Up @@ -108,8 +108,9 @@ export const buildDataStoreExpression = (
modelName: string,
importedModelName: string,
fieldConfigs: Record<string, FieldConfigMetadata>,
thisModelPrimaryKey: string,
dataSchema: GenericDataSchema,
) => {
const thisModelPrimaryKeys = dataSchema.models[modelName].primaryKeys;
let isHasManyFieldConfigExisting = false;
const hasManyDataStoreStatements: (VariableStatement | ExpressionStatement)[] = [];

Expand All @@ -118,12 +119,14 @@ export const buildDataStoreExpression = (
if (fieldConfigMetaData.relationship?.type === 'HAS_MANY') {
isHasManyFieldConfigExisting = true;
if (isManyToManyRelationship(fieldConfigMetaData)) {
const joinTable = dataSchema.models[fieldConfigMetaData.relationship.relatedJoinTableName];
hasManyDataStoreStatements.push(
...buildManyToManyRelationshipDataStoreStatements(
dataStoreActionType,
importedModelName,
fieldConfig,
thisModelPrimaryKey,
thisModelPrimaryKeys,
joinTable,
),
);
} else {
Expand All @@ -132,7 +135,7 @@ export const buildDataStoreExpression = (
dataStoreActionType,
importedModelName,
fieldConfig,
thisModelPrimaryKey,
thisModelPrimaryKeys,
),
);
}
Expand Down
9 changes: 6 additions & 3 deletions packages/codegen-ui-react/lib/forms/form-renderer-helper/map-from-fieldConfigs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
import { FieldConfigMetadata } from '@aws-amplify/codegen-ui';
import { FieldConfigMetadata, HasManyRelationshipType } from '@aws-amplify/codegen-ui';
import { PropertyAssignment } from 'typescript';
import {
buildDisplayValueFunction,
Expand Down Expand Up @@ -91,5 +91,8 @@ export function mapFromFieldConfigs(fieldConfigs: Record<string, FieldConfigMeta
};
}

export const isManyToManyRelationship = (fieldConfigMetaData: FieldConfigMetadata) =>
fieldConfigMetaData.relationship?.type === 'HAS_MANY' && fieldConfigMetaData.relationship.relatedJoinTableName;
export const isManyToManyRelationship = (
fieldConfigMetaData: FieldConfigMetadata,
): fieldConfigMetaData is FieldConfigMetadata & {
relationship: HasManyRelationshipType & { relatedJoinTableName: string };
} => !!(fieldConfigMetaData.relationship?.type === 'HAS_MANY' && fieldConfigMetaData.relationship.relatedJoinTableName);
Loading

0 comments on commit bd65d82

Please sign in to comment.