prisma-mock 0.4.0 → 0.4.1

package/lib/index.js

@@ -96,9 +96,9 @@ const createPrismaMock = (data = {}, datamodel = client_1.Prisma.dmmf.datamodel,
     };
     const getFieldRelationshipWhere = (item, field) => {
         if (field.relationToFields.length === 0) {
-            field = getJoinField(field);
+            const otherfield = getJoinField(field);
             return {
-                [field.relationFromFields[0]]: item[field.relationToFields[0]],
+                [otherfield.relationFromFields[0]]: item[otherfield.relationToFields[0]],
             };
         }
         return {
@@ -487,10 +487,12 @@ const createPrismaMock = (data = {}, datamodel = client_1.Prisma.dmmf.datamodel,
                             return getCamelCase(model.name) === childName;
                         });
                         const delegate = Delegate(getCamelCase(childName), submodel);
-                        const res = delegate.findMany({
+                        const res = delegate._findMany({
                             where: {
-                                ...childWhere,
-                                ...getFieldRelationshipWhere(item, info),
+                                AND: [
+                                    childWhere,
+                                    getFieldRelationshipWhere(item, info)
+                                ]
                             },
                         });
                         if (filter.every) {
@@ -596,7 +598,7 @@ const createPrismaMock = (data = {}, datamodel = client_1.Prisma.dmmf.datamodel,
             return true;
         };
         const matchAnd = (item, where) => {
-            return where.filter((child) => matchItems(item, child)).length > 0;
+            return where.filter((child) => matchItems(item, child)).length === where.length;
         };
         const matchOr = (item, where) => {
             return where.some((child) => matchItems(item, child));
@@ -626,7 +628,9 @@ const createPrismaMock = (data = {}, datamodel = client_1.Prisma.dmmf.datamodel,
             return found;
         };
         const findMany = (args) => {
-            let res = data[prop].filter(matchFnc(args?.where)).map(includes(args));
+            let res = data[prop]
+                .filter(matchFnc(args?.where))
+                .map(includes(args));
             if (args?.distinct) {
                 let values = {};
                 res = res.filter((item) => {
@@ -778,13 +782,13 @@ const createPrismaMock = (data = {}, datamodel = client_1.Prisma.dmmf.datamodel,
                     // Add relation
                     newItem = {
                         ...newItem,
-                        [key]: delegate.findMany(subArgs),
+                        [key]: delegate._findMany(subArgs),
                     };
                 }
                 else {
                     newItem = {
                         ...newItem,
-                        [key]: delegate.findUnique(subArgs),
+                        [key]: delegate._findMany(subArgs)?.[0] || null,
                     };
                 }
             });
@@ -881,6 +885,7 @@ const createPrismaMock = (data = {}, datamodel = client_1.Prisma.dmmf.datamodel,
                 return res.length;
             },
             _sortFunc: sortFunc,
+            _findMany: findMany
         };
     };
     datamodel.models.forEach((model) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-mock",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Mock prisma for unit testing database",
   "main": "lib/index.js",
   "repository": "https://github.com/demonsters/prisma-mock",