working _id queries and save() re: stargate/data-api#1359

stargate · Aug 27, 2024 · 189cde8 · 189cde8
1 parent 321dfbf
commit 189cde8
Show file tree

Hide file tree

Showing 26 changed files with 101 additions and 128 deletions.
diff --git a/discord-bot/README.md b/discord-bot/README.md
@@ -54,7 +54,7 @@ Create table:
 
 ```
 CREATE TABLE bots (
-   id           text, 
+   "_id"        text, 
    name         text,
-   PRIMARY KEY (id));
+   PRIMARY KEY ("_id"));
 ```
diff --git a/discord-bot/commands/createdocument.js b/discord-bot/commands/createdocument.js
@@ -7,7 +7,7 @@ module.exports = {
   data: new SlashCommandBuilder().setName('createdocument').setDescription('creates a document'),
   async execute(interaction) {
     console.log(new Date(), 'createdocument');
-    await Bot.insertMany([{ name: 'I am a document' }]);
+    await Bot.create({ name: 'I am a document' });
     await interaction.reply('done!');
   }
 };
diff --git a/discord-bot/models/bot.js b/discord-bot/models/bot.js
@@ -3,13 +3,8 @@
 const mongoose = require('../mongoose');
 
 const botSchema = new mongoose.Schema({
-  id: {
-    type: mongoose.Types.ObjectId,
-    required: true,
-    default: () => new mongoose.Types.ObjectId()
-  },
   name: String
-}, { _id: false, versionKey: false });
+}, { versionKey: false });
 
 const Bot = mongoose.model('Bot', botSchema);
 

diff --git a/discord-bot/test/countdocuments.test.js b/discord-bot/test/countdocuments.test.js
@@ -10,7 +10,7 @@ describe('countdocuments', function() {
   it('returns the number of bot documents', async function() {
     const docs = await Bot.find({});
     for (const doc of docs) {
-      await Bot.deleteOne({ id: doc.id });
+      await Bot.deleteOne({ _id: doc._id });
     }
     await Bot.insertMany({ name: 'test' });
 

diff --git a/discord-bot/test/createdocument.test.js b/discord-bot/test/createdocument.test.js
@@ -10,7 +10,7 @@ describe('createdocument', function() {
   it('inserts a new document', async function() {
     let docs = await Bot.find({});
     for (const doc of docs) {
-      await Bot.deleteOne({ id: doc.id });
+      await Bot.deleteOne({ _id: doc._id });
     }
 
     const interaction = {

diff --git a/discord-bot/test/setup.js b/discord-bot/test/setup.js
@@ -18,7 +18,7 @@ before(async function() {
 
   const docs = await Bot.find({});
   for (const doc of docs) {
-    await Bot.deleteOne({ id: doc.id });
+    await Bot.deleteOne({ _id: doc._id });
   }
 });
 

diff --git a/netlify-functions-ecommerce/README.md b/netlify-functions-ecommerce/README.md
@@ -77,26 +77,26 @@ Using test
 
 ```
 CREATE TABLE products (
-   id           text, 
+   "_id"        text, 
    name         text,
    price        decimal,
    image        text,
    description  text,
-   PRIMARY KEY (id));
+   PRIMARY KEY ("_id"));
 
 CREATE TABLE orders (
-   id             text, 
-   total          decimal,
-   name           text,
-   paymentMethod  text,
-   items          text,
-   PRIMARY KEY (id));
+   "_id"            text, 
+   total            decimal,
+   name             text,
+   "paymentMethod"  text,
+   items            text,
+   PRIMARY KEY ("_id"));
 
 CREATE TABLE carts (
-   id               text, 
-   items            text,
-   orderId          text,
-   total            decimal,
-   stripeSessionId  text,
-   PRIMARY KEY (id));
+   "_id"              text, 
+   items              text,
+   "orderId"          text,
+   total              decimal,
+   "stripeSessionId"  text,
+   PRIMARY KEY ("_id"));
 ```
diff --git a/netlify-functions-ecommerce/models.js b/netlify-functions-ecommerce/models.js
@@ -3,32 +3,29 @@
 const mongoose = require('./mongoose');
 
 const productSchema = new mongoose.Schema({
-  id: {
-    type: mongoose.Types.ObjectId,
-    required: true,
-    default: () => new mongoose.Types.ObjectId()
-  },
   name: String,
   price: Number,
   image: String,
   description: String
-}, { _id: false, versionKey: false });
+}, { versionKey: false });
 
 const Product = mongoose.model('Product', productSchema);
 
 module.exports.Product = Product;
 
 const orderSchema = new mongoose.Schema({
-  id: {
-    type: mongoose.Types.ObjectId,
-    required: true,
-    default: () => new mongoose.Types.ObjectId()
+  items: {
+    type: String,
+    get(v) {
+      return v == null ? v : JSON.parse(v);
+    },
+    set(v) {
+      if (v == null) {
+        return v;
+      }
+      return typeof v === 'string' ? v : JSON.stringify(v);
+    },
   },
-  items: [{
-    _id: false,
-    productId: { type: mongoose.ObjectId, required: true, ref: 'Product' },
-    quantity: { type: Number, required: true, validate: v => v > 0 }
-  }],
   total: {
     type: Number,
     default: 0
@@ -37,22 +34,24 @@ const orderSchema = new mongoose.Schema({
     type: String
   },
   paymentMethod: {
-    id: String,
-    brand: String,
-    last4: String
+    type: String,
+    get(v) {
+      return v == null ? v : JSON.parse(v);
+    },
+    set(v) {
+      if (v == null) {
+        return v;
+      }
+      return typeof v === 'string' ? v : JSON.stringify(v);
+    },
   }
-}, { _id: false, versionKey: false });
+}, { versionKey: false });
 
 const Order = mongoose.model('Order', orderSchema);
 
 module.exports.Order = Order;
 
 const cartSchema = new mongoose.Schema({
-  id: {
-    type: mongoose.Types.ObjectId,
-    required: true,
-    default: () => new mongoose.Types.ObjectId()
-  },
   items: {
     type: String,
     get(v) {
@@ -68,7 +67,7 @@ const cartSchema = new mongoose.Schema({
   orderId: { type: mongoose.ObjectId, ref: 'Order' },
   total: Number,
   stripeSessionId: { type: String }
-}, { _id: false, versionKey: false, timestamps: false, toObject: { getters: true }, toJSON: { getters: true } });
+}, { versionKey: false, timestamps: false, toObject: { getters: true }, toJSON: { getters: true } });
 
 cartSchema.virtual('numItems').get(function numItems() {
   if (this.items == null) {

diff --git a/netlify-functions-ecommerce/netlify/functions/addToCart.js b/netlify-functions-ecommerce/netlify/functions/addToCart.js
@@ -13,7 +13,7 @@ const handler = async(event) => {
     if (event.body.cartId) {
       // get the document containing the specified cartId
       const cart = await Cart.
-        findOne({ id: event.body.cartId }).
+        findOne({ _id: event.body.cartId }).
         setOptions({ sanitizeFilter: true });
 
       if (cart == null) {
@@ -31,7 +31,7 @@ const handler = async(event) => {
       for (const product of event.body.items) {
         const exists = cart.items?.find(item => item?.productId?.toString() === product?.productId?.toString());
         if (!exists) {
-          if (products.find(p => product?.productId?.toString() === p?.id?.toString())) {
+          if (products.find(p => product?.productId?.toString() === p?._id?.toString())) {
             cart.items = [...(cart.items || []), product];
           }
         } else {
@@ -46,7 +46,7 @@ const handler = async(event) => {
         return { statusCode: 200, body: JSON.stringify({ cart: null }) };
       }
 
-      await Cart.updateOne({ id: cart.id }, cart.getChanges());
+      await cart.save();
       return { statusCode: 200, body: JSON.stringify(cart) };
     } else {
       // If no cartId, create a new cart

diff --git a/netlify-functions-ecommerce/netlify/functions/checkout.js b/netlify-functions-ecommerce/netlify/functions/checkout.js
@@ -11,14 +11,14 @@ const handler = async(event) => {
     event.body = JSON.parse(event.body || {});
     await connect();
     const cart = await Cart.
-      findOne({ id: event.body.cartId }).
+      findOne({ _id: event.body.cartId }).
       setOptions({ sanitizeFilter: true }).
       orFail();
 
     const stripeProducts = { line_items: [] };
     let total = 0;
     for (let i = 0; i < cart.items.length; i++) {
-      const product = await Product.findOne({ id: cart.items[i].productId });
+      const product = await Product.findOne({ _id: cart.items[i].productId });
       stripeProducts.line_items.push({
         price_data: {
           currency: 'usd',
@@ -35,7 +35,7 @@ const handler = async(event) => {
     cart.total = total;
 
     if (process.env.STRIPE_SECRET_KEY === 'test') {
-      await Cart.updateOne({ id: cart.id }, cart.getChanges());
+      await cart.save();
       return {
         statusCode: 200,
         body: JSON.stringify({ cart: cart, url: '/order-confirmation' })
@@ -50,7 +50,7 @@ const handler = async(event) => {
     });
 
     cart.stripeSessionId = session.id;
-    await Cart.updateOne({ id: cart.id }, cart.getChanges());
+    await cart.save();
 
     return {
       statusCode: 200,

diff --git a/netlify-functions-ecommerce/netlify/functions/confirmOrder.js b/netlify-functions-ecommerce/netlify/functions/confirmOrder.js
@@ -11,12 +11,12 @@ const handler = async(event) => {
     event.body = JSON.parse(event.body || {});
     await connect();
     const cart = await Cart.
-      findOne({ id: event.body.cartId }).
+      findOne({ _id: event.body.cartId }).
       setOptions({ sanitizeFilter: true }).
       orFail();
 
     if (cart.orderId) {
-      const order = await Order.findOne({ id: cart.orderId }).orFail();
+      const order = await Order.findOne({ _id: cart.orderId }).orFail();
 
       return {
         statusCode: 200,
@@ -35,8 +35,8 @@ const handler = async(event) => {
         }
       });
 
-      cart.orderId = order.id;
-      await Cart.updateOne({ id: cart.id }, cart.getChanges());
+      cart.orderId = order._id;
+      await cart.save();
 
       return {
         statusCode: 200,
@@ -55,7 +55,7 @@ const handler = async(event) => {
       const intent = await stripe.paymentIntents.retrieve(session.payment_intent);
       const paymentMethod = await stripe.paymentMethods.retrieve(intent['payment_method']);
 
-      const [order] = await Order.insertMany({
+      const order = await Order.create({
         items: cart.items,
         name: session['customer_details'].name,
         total: +(session['amount_total'] / 100).toFixed(2),
@@ -64,8 +64,8 @@ const handler = async(event) => {
           null
       });
 
-      cart.orderId = order.id;
-      await Cart.updateOne({ id: cart.id }, cart.getChanges());
+      cart.orderId = order._id;
+      await cart.save();
 
       return {
         statusCode: 200,

diff --git a/netlify-functions-ecommerce/netlify/functions/getCart.js b/netlify-functions-ecommerce/netlify/functions/getCart.js
@@ -10,7 +10,7 @@ const handler = async(event) => {
     await connect();
     // get the document containing the specified cartId
     const cart = await Cart.
-      findOne({ id: event.queryStringParameters.cartId }).
+      findOne({ _id: event.queryStringParameters.cartId }).
       setOptions({ sanitizeFilter: true });
     return { statusCode: 200, body: JSON.stringify({ cart }) };
   } catch (error) {

diff --git a/netlify-functions-ecommerce/netlify/functions/removeFromCart.js b/netlify-functions-ecommerce/netlify/functions/removeFromCart.js
@@ -9,7 +9,7 @@ const handler = async(event) => {
   try {
     event.body = JSON.parse(event.body || {});
     await connect();
-    const cart = await Cart.findOne({ id: event.body.cartId });
+    const cart = await Cart.findOne({ _id: event.body.cartId });
     const index = cart.items.findIndex((item) =>
       item.productId.toString() == event.body.item.productId.toString()
     );
@@ -32,7 +32,7 @@ const handler = async(event) => {
         ...cart.items.slice(index + 1)
       ];
     }
-    await Cart.updateOne({ id: cart.id }, cart.getChanges());
+    await cart.save();
     return { statusCode: 200, body: JSON.stringify(cart) };
   } catch (error) {
     console.log(error);

diff --git a/netlify-functions-ecommerce/test/addToCart.test.js b/netlify-functions-ecommerce/test/addToCart.test.js
@@ -40,8 +40,8 @@ describe('Add to Cart', function() {
       body: {
         cartId: cart.id,
         items: [
-          { productId: products[0].id, quantity: 2 },
-          { productId: products[1].id, quantity: 1 }
+          { productId: products[0]._id, quantity: 2 },
+          { productId: products[1]._id, quantity: 1 }
         ]
       }
     };
@@ -58,10 +58,10 @@ describe('Add to Cart', function() {
     const { cart } = await fixtures.createCart({ products: [] });
     const params = {
       body: {
-        cartId: cart.id,
+        cartId: cart._id,
         items: [
-          { productId: products[0].id, quantity: 2 },
-          { productId: products[1].id, quantity: 1 }
+          { productId: products[0]._id, quantity: 2 },
+          { productId: products[1]._id, quantity: 1 }
         ]
       }
     };

diff --git a/netlify-functions-ecommerce/test/checkout.test.js b/netlify-functions-ecommerce/test/checkout.test.js
@@ -22,8 +22,8 @@ describe('Checkout', function() {
       body: {
         cartId: null,
         items: [
-          { productId: products[0].id, quantity: 2 },
-          { productId: products[1].id, quantity: 1 }
+          { productId: products[0]._id, quantity: 2 },
+          { productId: products[1]._id, quantity: 1 }
         ]
       }
     };
@@ -33,7 +33,7 @@ describe('Checkout', function() {
     assert(result.body);
     assert(result.body.items.length);
 
-    params.body.cartId = result.body.id;
+    params.body.cartId = result.body._id;
     sinon.stub(stripe.paymentIntents, 'retrieve').returns({ status: 'succeeded', id: '123', brand: 'visa', last4: '1234' });
     sinon.stub(stripe.paymentMethods, 'retrieve').returns({ status: 'succeeded', id: '123', brand: 'visa', last4: '1234' });
     sinon.stub(stripe.checkout.sessions, 'create').returns({

diff --git a/netlify-functions-ecommerce/test/fixtures/createCart.js b/netlify-functions-ecommerce/test/fixtures/createCart.js
@@ -3,6 +3,6 @@
 const { Cart } = require('../../models');
 
 module.exports = async function createCart(params) {
-  const [cart] = await Cart.insertMany({ items: params.items });
+  const cart = await Cart.create({ items: params.items });
   return { cart };
 };
diff --git a/netlify-functions-ecommerce/test/fixtures/createOrder.js b/netlify-functions-ecommerce/test/fixtures/createOrder.js
@@ -3,7 +3,6 @@
 const { Order } = require('../../models');
 
 module.exports = async function createOrder(params) {
-
-  const [order] = await Order.insertMany(params.order);
+  const [order] = await Order.create(params.order);
   return { order };
 };
diff --git a/netlify-functions-ecommerce/test/fixtures/createProducts.js b/netlify-functions-ecommerce/test/fixtures/createProducts.js
@@ -3,7 +3,7 @@
 const { Product } = require('../../models');
 
 module.exports = async function createProducts(params) {
-  const products = await Product.insertMany(params.product);
+  const products = await Product.create(params.product);
 
   return { products };
 };