@fjell/lib-sequelize 4.4.1 → 4.4.2

package/dist/index.cjs

@@ -187,7 +187,8 @@ const addReferenceQueries = (options, references, model)=>{
     return options;
 };
 const addCompoundCondition = (options, compoundCondition, model)=>{
-    const where = {};
+    // Ensure options.where exists
+    options.where = options.where || {};
     let compoundOp;
     const compoundType = compoundCondition.compoundType;
     if (compoundType === "AND") {
@@ -203,36 +204,135 @@ const addCompoundCondition = (options, compoundCondition, model)=>{
             throw new Error('Nest Compound conditions not supported');
         }
     });
-    where[compoundOp] = conditions;
-    options.where = where;
+    // Merge with existing where conditions instead of replacing
+    if (Object.keys(options.where).length > 0) {
+        // If there are existing conditions, wrap everything in an AND
+        options.where = {
+            [sequelize.Op.and]: [
+                options.where,
+                {
+                    [compoundOp]: conditions
+                }
+            ]
+        };
+    } else {
+        // If no existing conditions, just set the compound condition
+        options.where[compoundOp] = conditions;
+    }
     return options;
 };
-const addCondition = (conditions, condition, model)=>{
-    let conditionOp;
+const getSequelizeOperator = (operator)=>{
+    if (operator === '==') {
+        return sequelize.Op.eq;
+    } else if (operator === '<') {
+        return sequelize.Op.lt;
+    } else if (operator === '>') {
+        return sequelize.Op.gt;
+    } else if (operator === '<=') {
+        return sequelize.Op.lte;
+    } else if (operator === '>=') {
+        return sequelize.Op.gte;
+    } else if (operator === 'in') {
+        return sequelize.Op.in;
+    } else {
+        throw new Error(`Operator ${operator} not supported`);
+    }
+};
+const addAssociationCondition = (conditions, condition, model)=>{
+    const [associationName, attributeName] = condition.column.split('.', 2);
+    // Check if the association exists on the model
+    if (!model.associations || !model.associations[associationName]) {
+        throw new Error(`Association ${associationName} not found on model ${model.name}`);
+    }
+    const association = model.associations[associationName];
+    const associatedModel = association.target;
+    // Check if the attribute exists on the associated model
+    if (!associatedModel.getAttributes()[attributeName]) {
+        throw new Error(`Attribute ${attributeName} not found on associated model ${associatedModel.name} for association ${associationName}`);
+    }
+    // Use Sequelize's $association.attribute$ syntax for querying associated models
+    const sequelizeAssociationColumn = `$${associationName}.${attributeName}$`;
+    const conditionOp = getSequelizeOperator(condition.operator);
+    conditions[sequelizeAssociationColumn] = {
+        [conditionOp]: condition.value
+    };
+    return conditions;
+};
+const addAttributeCondition = (conditions, condition, model)=>{
     const conditionColumn = condition.column;
     if (!model.getAttributes()[conditionColumn]) {
         throw new Error(`Condition column ${conditionColumn} not found on model ${model.name}`);
     }
-    if (condition.operator === '==') {
-        conditionOp = sequelize.Op.eq;
-    } else if (condition.operator === '<') {
-        conditionOp = sequelize.Op.lt;
-    } else if (condition.operator === '>') {
-        conditionOp = sequelize.Op.gt;
-    } else if (condition.operator === '<=') {
-        conditionOp = sequelize.Op.lte;
-    } else if (condition.operator === '>=') {
-        conditionOp = sequelize.Op.gte;
-    } else if (condition.operator === 'in') {
-        conditionOp = sequelize.Op.in;
-    } else {
-        throw new Error(`Operator ${condition.operator} not supported`);
-    }
+    const conditionOp = getSequelizeOperator(condition.operator);
     conditions[conditionColumn] = {
         [conditionOp]: condition.value
     };
     return conditions;
 };
+const addCondition = (conditions, condition, model)=>{
+    const conditionColumn = condition.column;
+    // Check if this is an association query (contains a dot)
+    if (conditionColumn.includes('.')) {
+        return addAssociationCondition(conditions, condition, model);
+    }
+    // Handle regular column queries
+    return addAttributeCondition(conditions, condition, model);
+};
+const collectAssociationsFromConditions = (conditions)=>{
+    const associations = new Set();
+    const processObject = (obj)=>{
+        if (typeof obj === 'object' && obj !== null) {
+            // Check string keys
+            Object.keys(obj).forEach((key)=>{
+                // Check if this is an association reference ($association.attribute$)
+                if (typeof key === 'string' && key.startsWith('$') && key.endsWith('$') && key.includes('.')) {
+                    const associationName = key.substring(1, key.indexOf('.'));
+                    associations.add(associationName);
+                }
+                // Recursively process nested objects
+                if (typeof obj[key] === 'object') {
+                    processObject(obj[key]);
+                }
+            });
+            // Also check Symbol keys (for compound conditions like Op.and, Op.or)
+            Object.getOwnPropertySymbols(obj).forEach((symbol)=>{
+                if (typeof obj[symbol] === 'object') {
+                    processObject(obj[symbol]);
+                }
+            });
+        }
+        // Handle arrays (for compound conditions that might be arrays)
+        if (Array.isArray(obj)) {
+            obj.forEach((item)=>{
+                if (typeof item === 'object') {
+                    processObject(item);
+                }
+            });
+        }
+    };
+    processObject(conditions);
+    return associations;
+};
+const addAssociationIncludes = (options, model)=>{
+    // Collect all association names used in conditions
+    const referencedAssociations = collectAssociationsFromConditions(options.where);
+    if (referencedAssociations.size > 0) {
+        options.include = options.include || [];
+        // Add each referenced association to the include array
+        referencedAssociations.forEach((associationName)=>{
+            // Check if this association is already included
+            const alreadyIncluded = options.include.some((inc)=>typeof inc === 'string' && inc === associationName || typeof inc === 'object' && inc.association === associationName);
+            if (!alreadyIncluded && model.associations && model.associations[associationName]) {
+                options.include.push({
+                    model: model.associations[associationName].target,
+                    as: associationName,
+                    required: false // Use LEFT JOIN so records without associations are still returned
+                });
+            }
+        });
+    }
+    return options;
+};
 const buildQuery = (itemQuery, model)=>{
     logger$b.default('build', {
         itemQuery
@@ -282,10 +382,156 @@ const buildQuery = (itemQuery, model)=>{
             ];
         });
     }
+    // Add includes for any associations referenced in conditions
+    options = addAssociationIncludes(options, model);
     return options;
 };
 
+/* eslint-disable indent */ /**
+ * Helper function to build relationship chain includes
+ */ const buildRelationshipChain = (targetModel, kta, currentIndex, targetIndex)=>{
+    // Build the association path and validate relationships exist
+    const associationParts = [];
+    const modelChain = [
+        targetModel
+    ];
+    let currentModel = targetModel;
+    // Validate that all associations exist and build model chain
+    for(let i = currentIndex + 1; i <= targetIndex; i++){
+        const intermediateType = kta[i];
+        const associationName = intermediateType;
+        if (!currentModel.associations || !currentModel.associations[associationName]) {
+            return {
+                success: false
+            };
+        }
+        associationParts.push(associationName);
+        currentModel = currentModel.associations[associationName].target;
+        modelChain.push(currentModel);
+    }
+    // Build the full association path for the target field
+    const targetType = kta[targetIndex];
+    const associationPath = `$${associationParts.join('.')}.${targetType}Id$`;
+    // Build nested includes structure iteratively (clearer than recursion)
+    let deepestInclude = null;
+    // Build from the deepest level back to the root
+    for(let i = targetIndex; i > currentIndex; i--){
+        const currentType = kta[i];
+        const modelIndex = i - currentIndex;
+        const includeObj = {
+            model: modelChain[modelIndex],
+            as: currentType,
+            required: true
+        };
+        if (deepestInclude) {
+            includeObj.include = [
+                deepestInclude
+            ];
+        }
+        deepestInclude = includeObj;
+    }
+    const includes = deepestInclude ? [
+        deepestInclude
+    ] : [];
+    return {
+        success: true,
+        path: associationPath,
+        includes
+    };
+};
+/**
+ * Helper function to build relationship path for a locator
+ * @param includeIsDirect Whether to include the isDirect flag in the result
+ */ const relationshipUtils.buildRelationshipPath = (targetModel, locatorType, kta, includeIsDirect = false)=>{
+    // First check if the field exists directly
+    const directFieldName = `${locatorType}Id`;
+    const attributes = targetModel.getAttributes();
+    if (attributes && attributes[directFieldName]) {
+        const result = {
+            found: true
+        };
+        if (includeIsDirect) {
+            result.isDirect = true;
+        }
+        return result;
+    }
+    // If not direct, look for relationship path
+    const targetIndex = kta.indexOf(locatorType);
+    if (targetIndex === -1) {
+        const result = {
+            found: false
+        };
+        if (includeIsDirect) {
+            result.isDirect = false;
+        }
+        return result;
+    }
+    const currentIndex = 0; // We're always looking from the base model
+    if (targetIndex <= currentIndex) {
+        const result = {
+            found: false
+        };
+        if (includeIsDirect) {
+            result.isDirect = false;
+        }
+        return result;
+    }
+    const chainResult = buildRelationshipChain(targetModel, kta, currentIndex, targetIndex);
+    if (chainResult.success) {
+        const result = {
+            found: true,
+            path: chainResult.path,
+            includes: chainResult.includes
+        };
+        if (includeIsDirect) {
+            result.isDirect = false;
+        }
+        return result;
+    }
+    const result = {
+        found: false
+    };
+    if (includeIsDirect) {
+        result.isDirect = false;
+    }
+    return result;
+};
+
 const logger$a = logger$1.default.get('sequelize', 'KeyMaster');
+// Helper function to extract location key value from item
+const extractLocationKeyValue = (model, item, locatorType, kta)=>{
+    logger$a.default('Extracting location key value', {
+        locatorType,
+        kta
+    });
+    const relationshipInfo = relationshipUtils.buildRelationshipPath(model, locatorType, kta, true);
+    if (!relationshipInfo.found) {
+        throw new Error(`Location key '${locatorType}' cannot be resolved on model '${model.name}' or through its relationships.`);
+    }
+    if (relationshipInfo.isDirect) {
+        // Direct foreign key field
+        const foreignKeyField = `${locatorType}Id`;
+        const value = item[foreignKeyField];
+        if (typeof value === 'undefined' || value === null) {
+            throw new Error(`Direct foreign key field '${foreignKeyField}' is missing or null in item`);
+        }
+        return value;
+    } else {
+        // Need to traverse relationship
+        // Try to get the value from the loaded relationship object
+        const relationshipObject = item[locatorType];
+        if (relationshipObject && typeof relationshipObject.id !== 'undefined') {
+            return relationshipObject.id;
+        }
+        // If the relationship object isn't loaded, we might need to look at the foreign key field
+        // This handles cases where we have the foreign key but not the full object
+        const foreignKeyField = `${locatorType}Id`;
+        if (typeof item[foreignKeyField] !== 'undefined' && item[foreignKeyField] !== null) {
+            return item[foreignKeyField];
+        }
+        throw new Error(`Unable to extract location key for '${locatorType}'. Neither the relationship object nor direct foreign key is available.`);
+    }
+};
 const removeKey = (item)=>{
     logger$a.default('Removing Key', {
         item
@@ -320,11 +566,13 @@ const removeKey = (item)=>{
 //   }
 //   return item;
 // }
-const addKey = (item, keyTypes)=>{
+const addKey = (model, item, keyTypes)=>{
     logger$a.default('Adding Key', {
         item
     });
     const key = {};
+    const modelClass = model.constructor;
+    const primaryKeyAttr = modelClass.primaryKeyAttribute;
     if (Array.isArray(keyTypes) && keyTypes.length > 1) {
         const type = [
             ...keyTypes
@@ -332,33 +580,34 @@ const addKey = (item, keyTypes)=>{
         const pkType = type.shift();
         Object.assign(key, {
             kt: pkType,
-            pk: item.id
+            pk: item[primaryKeyAttr]
         });
-        // TODO: This is really just for primary items
-        if (type.length === 1) {
-            // TODO: This should be looking at the model to get the primary key of the reference item or association
-            const locKeyTypeId = type[0] + 'Id';
-            Object.assign(key, {
-                loc: [
-                    {
-                        kt: type[0],
-                        lk: item[locKeyTypeId]
-                    }
-                ]
-            });
-        } else if (type.length === 2) {
-            throw new Error('Not implemented');
-        } else if (type.length === 3) {
-            throw new Error('Not implemented');
-        } else if (type.length === 4) {
-            throw new Error('Not implemented');
-        } else if (type.length === 5) {
-            throw new Error('Not implemented');
+        // Build location keys for composite key
+        const locationKeys = [];
+        for (const locatorType of type){
+            try {
+                const lk = extractLocationKeyValue(modelClass, item, locatorType, keyTypes);
+                locationKeys.push({
+                    kt: locatorType,
+                    lk
+                });
+            } catch (error) {
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                logger$a.error(`Failed to extract location key for '${locatorType}'`, {
+                    error: errorMessage,
+                    item,
+                    keyTypes
+                });
+                throw error;
+            }
         }
+        Object.assign(key, {
+            loc: locationKeys
+        });
     } else {
         Object.assign(key, {
             kt: keyTypes[0],
-            pk: item.id
+            pk: item[primaryKeyAttr]
         });
     }
     Object.assign(item, {
@@ -435,6 +684,24 @@ const populateEvents = (item)=>{
     item.events = events;
     return item;
 };
+const extractEvents = (item)=>{
+    logger$9.default('Extracting Events to database fields', {
+        item
+    });
+    if (item.events) {
+        var _item_events_created, _item_events_updated, _item_events_deleted;
+        if ((_item_events_created = item.events.created) === null || _item_events_created === void 0 ? void 0 : _item_events_created.at) {
+            item.createdAt = item.events.created.at;
+        }
+        if ((_item_events_updated = item.events.updated) === null || _item_events_updated === void 0 ? void 0 : _item_events_updated.at) {
+            item.updatedAt = item.events.updated.at;
+        }
+        if ((_item_events_deleted = item.events.deleted) === null || _item_events_deleted === void 0 ? void 0 : _item_events_deleted.at) {
+            item.deletedAt = item.events.deleted.at;
+        }
+    }
+    return item;
+};
 const removeEvents = (item)=>{
     logger$9.default('Removing Events', {
         item
@@ -452,7 +719,7 @@ const processRow = async (row, keyTypes, referenceDefinitions, aggregationDefini
         plain: true
     });
     logger$8.default('Adding Key to Item with Key Types: %s', general.stringifyJSON(keyTypes));
-    item = addKey(item, keyTypes);
+    item = addKey(row, item, keyTypes);
     item = populateEvents(item);
     logger$8.default('Key Added to Item: %s', general.stringifyJSON(item.key));
     if (referenceDefinitions && referenceDefinitions.length > 0) {
@@ -522,16 +789,143 @@ const all.getAllOperation = (models, definition, registry)=>{
 };
 
 const logger$6 = logger$1.default.get('sequelize', 'ops', 'create');
-const getCreateOperation = (// eslint-disable-next-line @typescript-eslint/no-unused-vars
-models, // eslint-disable-next-line @typescript-eslint/no-unused-vars
-definition, // eslint-disable-next-line @typescript-eslint/no-unused-vars
-registry)=>{
+// Helper function to validate hierarchical chain exists
+async function validateHierarchicalChain(models, locKey, kta) {
+    // Find the direct parent model that contains this locator
+    const locatorIndex = kta.indexOf(locKey.kt);
+    if (locatorIndex === -1) {
+        throw new Error(`Locator type '${locKey.kt}' not found in kta array`);
+    }
+    // Get the model for this locator
+    const locatorModel = models[locatorIndex] || models[0]; // Fallback to primary model
+    // Build a query to validate the chain exists
+    const chainResult = buildRelationshipChain(locatorModel, kta, locatorIndex, kta.length - 1);
+    if (!chainResult.success) {
+        // If we can't build a chain, just validate the record exists
+        const record = await locatorModel.findByPk(locKey.lk);
+        if (!record) {
+            throw new Error(`Referenced ${locKey.kt} with id ${locKey.lk} does not exist`);
+        }
+        return;
+    }
+    // Validate that the chain exists
+    const queryOptions = {
+        where: {
+            id: locKey.lk
+        }
+    };
+    if (chainResult.includes && chainResult.includes.length > 0) {
+        queryOptions.include = chainResult.includes;
+    }
+    const record = await locatorModel.findOne(queryOptions);
+    if (!record) {
+        throw new Error(`Referenced ${locKey.kt} with id ${locKey.lk} does not exist or chain is invalid`);
+    }
+}
+const getCreateOperation = (models, definition, registry)=>{
     const create = async (item, options)=>{
         logger$6.default('Create', {
             item,
             options
         });
-        throw new Error('Not implemented');
+        const { coordinate, options: { references, aggregations } } = definition;
+        const { kta } = coordinate;
+        // Get the primary model (first model in array)
+        const model = models[0];
+        const modelAttributes = model.getAttributes();
+        // Validate that all item attributes exist on the model
+        let itemData = {
+            ...item
+        };
+        // TODO: We need the opposite of processRow, something to step down from fjell to database.
+        itemData = extractEvents(itemData);
+        itemData = removeEvents(itemData);
+        for (const key of Object.keys(itemData)){
+            if (!modelAttributes[key]) {
+                throw new Error(`Attribute '${key}' does not exist on model ${model.name}`);
+            }
+        }
+        // Handle key options
+        // If a key is supplied, assume its contents are to be assigned to the appropriate ids.
+        // For most cases this will be null as key generation is often through autoIncrement.
+        // If this is a CItem then the locations will be present.
+        if (options === null || options === void 0 ? void 0 : options.key) {
+            const key = options.key;
+            if (core.isPriKey(key)) {
+                // Set the primary key
+                itemData.id = key.pk;
+            } else if (core.isComKey(key)) {
+                // Set primary key
+                itemData.id = key.pk;
+                // Process location keys - only set direct foreign keys, validate hierarchical chains
+                const comKey = key;
+                const directLocations = [];
+                const hierarchicalLocations = [];
+                // Categorize location keys as direct or hierarchical
+                for (const locKey of comKey.loc){
+                    const relationshipInfo = relationshipUtils.buildRelationshipPath(model, locKey.kt, kta, true);
+                    if (!relationshipInfo.found) {
+                        const errorMessage = `Composite key locator '${locKey.kt}' cannot be resolved on model '${model.name}' or through its relationships.`;
+                        logger$6.error(errorMessage, {
+                            key: comKey,
+                            kta
+                        });
+                        throw new Error(errorMessage);
+                    }
+                    if (relationshipInfo.isDirect) {
+                        directLocations.push(locKey);
+                    } else {
+                        hierarchicalLocations.push(locKey);
+                    }
+                }
+                // Set direct foreign keys
+                for (const locKey of directLocations){
+                    const foreignKeyField = locKey.kt + 'Id';
+                    itemData[foreignKeyField] = locKey.lk;
+                }
+                // Validate hierarchical chains exist
+                for (const locKey of hierarchicalLocations){
+                    await validateHierarchicalChain(models, locKey, kta);
+                }
+            }
+        }
+        // Handle locations options
+        // This is the most frequent way relationship ids will be set
+        if (options === null || options === void 0 ? void 0 : options.locations) {
+            const directLocations = [];
+            const hierarchicalLocations = [];
+            // Categorize location keys as direct or hierarchical
+            for (const locKey of options.locations){
+                const relationshipInfo = relationshipUtils.buildRelationshipPath(model, locKey.kt, kta, true);
+                if (!relationshipInfo.found) {
+                    const errorMessage = `Location key '${locKey.kt}' cannot be resolved on model '${model.name}' or through its relationships.`;
+                    logger$6.error(errorMessage, {
+                        locations: options.locations,
+                        kta
+                    });
+                    throw new Error(errorMessage);
+                }
+                if (relationshipInfo.isDirect) {
+                    directLocations.push(locKey);
+                } else {
+                    hierarchicalLocations.push(locKey);
+                }
+            }
+            // Set direct foreign keys
+            for (const locKey of directLocations){
+                const foreignKeyField = locKey.kt + 'Id';
+                itemData[foreignKeyField] = locKey.lk;
+            }
+            // Validate hierarchical chains exist
+            for (const locKey of hierarchicalLocations){
+                await validateHierarchicalChain(models, locKey, kta);
+            }
+        }
+        // Create the record
+        const createdRecord = await model.create(itemData);
+        // Add key and events
+        const processedRecord = await processRow(createdRecord, kta, references, aggregations, registry);
+        return core.validateKeys(processedRecord, kta);
     };
     return create;
 };
@@ -572,6 +966,42 @@ const getFindOperation = (models, definition, registry)=>{
 };
 
 const logger$4 = logger$1.default.get('sequelize', 'ops', 'get');
+// Helper function to process composite key and build query options
+const processCompositeKey$1 = (comKey, model, kta)=>{
+    const where = {
+        id: comKey.pk
+    };
+    const includes = [];
+    for (const locator of comKey.loc){
+        const relationshipInfo = relationshipUtils.buildRelationshipPath(model, locator.kt, kta);
+        if (!relationshipInfo.found) {
+            const errorMessage = `Composite key locator '${locator.kt}' cannot be resolved on model '${model.name}' or through its relationships.`;
+            logger$4.error(errorMessage, {
+                key: comKey,
+                kta
+            });
+            throw new Error(errorMessage);
+        }
+        if (relationshipInfo.path) {
+            // This requires a relationship traversal
+            where[relationshipInfo.path] = locator.lk;
+            if (relationshipInfo.includes) {
+                includes.push(...relationshipInfo.includes);
+            }
+        } else {
+            // This is a direct field
+            const fieldName = `${locator.kt}Id`;
+            where[fieldName] = locator.lk;
+        }
+    }
+    const result = {
+        where
+    };
+    if (includes.length > 0) {
+        result.include = includes;
+    }
+    return result;
+};
 const getGetOperation = (models, definition, registry)=>{
     const { coordinate, options: { references, aggregations } } = definition;
     const { kta } = coordinate;
@@ -588,17 +1018,16 @@ const getGetOperation = (models, definition, registry)=>{
         const model = models[0];
         let item;
         if (core.isPriKey(itemKey)) {
+            // This is the easy case because we can just find the item by its primary key
             item = await model.findByPk(itemKey.pk);
         } else if (core.isComKey(itemKey)) {
-            var _comKey_loc_, _comKey_loc_1;
+            // This is a composite key, so we need to build a where clause based on the composite key's locators
             const comKey = itemKey;
-            // TODO: This should probably interrogate the model?
-            item = await model.findOne({
-                where: {
-                    id: comKey.pk,
-                    [(comKey === null || comKey === void 0 ? void 0 : (_comKey_loc_ = comKey.loc[0]) === null || _comKey_loc_ === void 0 ? void 0 : _comKey_loc_.kt) + 'Id']: comKey === null || comKey === void 0 ? void 0 : (_comKey_loc_1 = comKey.loc[0]) === null || _comKey_loc_1 === void 0 ? void 0 : _comKey_loc_1.lk
-                }
+            const queryOptions = processCompositeKey$1(comKey, model, kta);
+            logger$4.default('Composite key query', {
+                queryOptions
             });
+            item = await model.findOne(queryOptions);
         }
         if (!item) {
             throw new Library.NotFoundError('get', coordinate, key);
@@ -627,6 +1056,42 @@ const getOneOperation = (models, definition, registry)=>{
 };
 
 const logger$2 = logger$1.default.get('sequelize', 'ops', 'remove');
+// Helper function to process composite key and build query options
+const processCompositeKey = (comKey, model, kta)=>{
+    const where = {
+        id: comKey.pk
+    };
+    const includes = [];
+    for (const locator of comKey.loc){
+        const relationshipInfo = relationshipUtils.buildRelationshipPath(model, locator.kt, kta);
+        if (!relationshipInfo.found) {
+            const errorMessage = `Composite key locator '${locator.kt}' cannot be resolved on model '${model.name}' or through its relationships.`;
+            logger$2.error(errorMessage, {
+                key: comKey,
+                kta
+            });
+            throw new Error(errorMessage);
+        }
+        if (relationshipInfo.path) {
+            // This requires a relationship traversal
+            where[relationshipInfo.path] = locator.lk;
+            if (relationshipInfo.includes) {
+                includes.push(...relationshipInfo.includes);
+            }
+        } else {
+            // This is a direct field
+            const fieldName = `${locator.kt}Id`;
+            where[fieldName] = locator.lk;
+        }
+    }
+    const result = {
+        where
+    };
+    if (includes.length > 0) {
+        result.include = includes;
+    }
+    return result;
+};
 const getRemoveOperation = (models, definition, // eslint-disable-next-line @typescript-eslint/no-unused-vars
 registry)=>{
     const { coordinate, options } = definition;
@@ -647,14 +1112,16 @@ registry)=>{
         if (core.isPriKey(key)) {
             item = await model.findByPk(key.pk);
         } else if (core.isComKey(key)) {
-            var _comKey_loc_, _comKey_loc_1;
+            // This is a composite key, so we need to build a where clause based on the composite key's locators
             const comKey = key;
-            item = await model.findOne({
-                where: {
-                    id: comKey.pk,
-                    [(comKey === null || comKey === void 0 ? void 0 : (_comKey_loc_ = comKey.loc[0]) === null || _comKey_loc_ === void 0 ? void 0 : _comKey_loc_.kt) + 'Id']: comKey === null || comKey === void 0 ? void 0 : (_comKey_loc_1 = comKey.loc[0]) === null || _comKey_loc_1 === void 0 ? void 0 : _comKey_loc_1.lk
-                }
+            const queryOptions = processCompositeKey(comKey, model, kta);
+            logger$2.default('Composite key query', {
+                queryOptions
             });
+            item = await model.findOne(queryOptions);
+        }
+        if (!item) {
+            throw new Error(`Item not found for removal with key: ${core.abbrevIK(key)}`);
         }
         const isDeletedAttribute = model.getAttributes().isDeleted;
         const deletedAtAttribute = model.getAttributes().deletedAt;
@@ -670,14 +1137,14 @@ registry)=>{
             returnItem = item === null || item === void 0 ? void 0 : item.get({
                 plain: true
             });
-            returnItem = addKey(returnItem, kta);
+            returnItem = addKey(item, returnItem, kta);
             returnItem = populateEvents(returnItem);
         } else if (options.deleteOnRemove) {
             await (item === null || item === void 0 ? void 0 : item.destroy());
             returnItem = item === null || item === void 0 ? void 0 : item.get({
                 plain: true
             });
-            returnItem = addKey(returnItem, kta);
+            returnItem = addKey(item, returnItem, kta);
             returnItem = populateEvents(returnItem);
         } else {
             throw new Error('No deletedAt or isDeleted attribute found in model, and deleteOnRemove is not set');
@@ -716,7 +1183,9 @@ const getUpdateOperation = (models, definition, registry)=>{
         if (response) {
             // Remove the key and events
             let updateProps = removeKey(item);
-            updateProps = removeEvents(item);
+            // TODO: We need the opposite of processRow, something to step down from fjell to database.
+            updateProps = extractEvents(updateProps);
+            updateProps = removeEvents(updateProps);
             logger$1.default('Response: %s', general.stringifyJSON(response));
             logger$1.default('Update Properties: %s', general.stringifyJSON(updateProps));
             // Update the object
@@ -736,12 +1205,12 @@ const createOperations = (models, definition, registry)=>{
     const operations = {};
     operations.all = all.getAllOperation(models, definition, registry);
     operations.one = getOneOperation(models, definition, registry);
-    operations.create = getCreateOperation();
+    operations.create = getCreateOperation(models, definition, registry);
     operations.update = getUpdateOperation(models, definition, registry);
     operations.get = getGetOperation(models, definition, registry);
     operations.remove = getRemoveOperation(models, definition);
     operations.find = getFindOperation(models, definition, registry);
-    operations.upsert = ()=>{
+    operations.upsert = async ()=>{
         throw new Error('Not implemented');
     };
     return operations;