@next-k8s/tickets 1.0.24 → 1.0.27

package/src/events/listeners/__test__/order-created.test.ts

@@ -0,0 +1,44 @@
+import mongoose from 'mongoose'
+import { Message } from 'node-nats-streaming'
+import { OrderCreatedEvent, OrderStatus } from '@next-k8s/common'
+
+import Ticket from '../../../models/ticket'
+import natsClient from '../../../nats-client'
+import OrderCreatedListener from '../order-created'
+
+const setup = async () => {
+  const listener = new OrderCreatedListener(natsClient.client)
+  const ticket = new Ticket({ title: 'Test Ticket', price: 21000, owner: new mongoose.Types.ObjectId().toHexString() })
+  await ticket.save()
+
+  const data: OrderCreatedEvent['data'] = {
+    id: new mongoose.Types.ObjectId().toHexString(),
+    version: 0,
+    status: OrderStatus.Created,
+    owner: new mongoose.Types.ObjectId().toHexString(),
+    expiresAt: new Date().toUTCString(),
+    ticket: {
+      id: ticket.id,
+      price: ticket.price
+    }
+  }
+
+  // @ts-ignore
+  const message: Message = { ack: jest.fn() }
+  return { data, listener, message, ticket }
+}
+
+describe('[Order Created] Listener', () => {
+  it('should set the ticket owner', async () => {
+    const { data, listener, message, ticket } = await setup()
+    await listener.onMessage(data, message)
+    const updatedTicket = await Ticket.findById(ticket.id)
+    expect(updatedTicket.orderId).toBe(data.id)
+  })
+
+  it('should ack the message', async () =>{
+    const { data, listener, message } = await setup()
+    await listener.onMessage(data, message)
+    expect(message.ack).toHaveBeenCalled()
+  })
+})

package/src/events/listeners/_queue-group-name.ts

@@ -0,0 +1 @@
+export default 'tickets-service'

package/src/events/listeners/order-created.ts

@@ -0,0 +1,22 @@
+import { Listener, NotFoundError, OrderCreatedEvent, Subjects } from '@next-k8s/common'
+import { Message } from 'node-nats-streaming'
+import Ticket from '../../models/ticket'
+import TicketUpdatedPublisher from '../publishers/updated'
+
+import queueGroupName from './_queue-group-name'
+
+export class OrderCreatedListener extends Listener<OrderCreatedEvent> {
+  readonly subject = Subjects.OrderCreated
+  queueGroupName = queueGroupName
+
+  async onMessage (data: OrderCreatedEvent['data'], msg: Message) {
+    const ticket = await Ticket.findById(data.ticket.id)
+    if (!ticket) throw new NotFoundError('Ticket not found')
+    ticket.set({ orderId: data.id })
+    await ticket.save()
+
+    msg.ack()
+  }
+}
+
+export default OrderCreatedListener

package/src/models/__test__/ticket.test.ts

@@ -0,0 +1,37 @@
+import mongoose from 'mongoose'
+import Ticket from '../ticket'
+
+describe('[Models] Ticket Model', () => {
+  it('implements optimistic concurrency control', async () => {
+    const ticket = new Ticket({ title: 'Test Ticket', price: 20000, owner: new mongoose.Types.ObjectId().toHexString() })
+    await ticket.save()
+
+    const copies = [
+      await Ticket.findById(ticket.id),
+      await Ticket.findById(ticket.id)
+    ]
+
+    copies[0].set({ price: 15000 })
+    copies[1].set({ price: 23000 })
+
+    await copies[0].save()
+    
+    try {
+      await copies[1].save()
+    } catch {
+      return
+    }
+
+    throw new Error('Ticket was saved when it should not have been')
+  })
+
+  it('increments the version number on update', async () => {
+    const ticket = new Ticket({ title: 'Test Ticket', price: 20000, owner: new mongoose.Types.ObjectId().toHexString() })
+    await ticket.save()
+    expect(ticket.version).toEqual(0)
+    await ticket.save()
+    expect(ticket.version).toEqual(1)
+    await ticket.save()
+    expect(ticket.version).toEqual(2)
+  })
+})

package/src/models/ticket.ts

@@ -1,9 +1,11 @@
 import mongoose, { ObjectId } from 'mongoose'
+import { updateIfCurrentPlugin } from 'mongoose-update-if-current'
 
 interface TicketAttributes {
-  title: String;
-  price: Number;
+  title: string;
+  price: number;
   owner: string;
+  orderId?: string;
   createdAt?: Date;
   updatedAt?: Date;
 }
@@ -22,10 +24,13 @@ const ticketSchema = new mongoose.Schema({
   owner: {
     type: mongoose.Schema.Types.ObjectId,
     required: true
+  },
+
+  orderId: {
+    type: String
   }
 }, {
   toJSON: {
-    versionKey: false,
     transform (doc, ret) {
       ret.id = ret._id
       delete ret._id
@@ -34,6 +39,9 @@ const ticketSchema = new mongoose.Schema({
   }
 })
 
+ticketSchema.set('versionKey', 'version')
+ticketSchema.plugin(updateIfCurrentPlugin)
+
 export const TicketModel = mongoose.model('Ticket', ticketSchema)
 export default class Ticket extends TicketModel {
   constructor(attributes: TicketAttributes) {

package/src/routes/__test__/get.test.ts

@@ -5,6 +5,21 @@ import { getTokenCookie } from '@next-k8s/common'
 import app from '../../app'
 import { createTicket } from '../../test/utils'
 
+describe('[List Tickets] Route: GET /api/tickets', () => {
+  it('should return a list of tickets', async () => {
+    const cookie = await getTokenCookie({ id: new mongoose.Types.ObjectId().toHexString() })
+    await createTicket(app, cookie)
+    await createTicket(app, cookie, 'Test Event 2', 40000)
+    const list = await request(app)
+      .get('/api/tickets')
+      .send()
+      .expect(200)
+
+    expect(list.body.tickets).toBeDefined()
+    expect(list.body.tickets.length).toEqual(2)
+  })
+})
+
 describe('[Get Ticket] Route: GET /api/tickets/:id', () => {
   it('should throw a BadRequestError if ticket ID is invalid', async () => {
     await request(app)

package/src/routes/create.ts

@@ -3,7 +3,7 @@ import { body } from 'express-validator'
 import { requireAuth, validateRequest } from '@next-k8s/common'
 
 import Ticket from '../models/ticket'
-import { TicketCreatedPublisher } from '../events/publishers/tickets/created'
+import TicketCreatedPublisher from '../events/publishers/created'
 import natsClient from '../nats-client'
 
 const router = express.Router()
@@ -17,7 +17,7 @@ router.post('/api/tickets', requireAuth, validateInput, validateRequest, async (
   const { title, price } = req.body
   const ticket = new Ticket({ title, price, owner: req.currentUser!.id })
   await ticket.save()
-  new TicketCreatedPublisher(natsClient.client).publish({ id: ticket.id, title: ticket.title, price: ticket.price, owner: ticket.owner })
+  new TicketCreatedPublisher(natsClient.client).publish({ id: ticket.id, version: ticket.version, title: ticket.title, price: ticket.price, owner: ticket.owner })
   res.status(201).send({ ticket })
 })
 

package/src/routes/get.ts

@@ -6,6 +6,11 @@ import Ticket from '../models/ticket'
 
 const router = express.Router()
 
+router.get('/api/tickets', async (req: Request, res: Response) => {
+  const tickets = await Ticket.find({})
+  res.send({ tickets })
+})
+
 router.get('/api/tickets/:id', async (req: Request, res: Response) => {
   if (!isValidObjectId(req.params.id)) throw new BadRequestError('Invalid Ticket ID')
   const ticket = await Ticket.findById(req.params.id)

package/src/routes/index.ts

@@ -1,6 +1,5 @@
 import getTicket from './get'
-import findTickets from './find'
 import createTicket from './create'
 import updateTicket from './update'
 
-export default [findTickets, getTicket, createTicket, updateTicket]
+export default [getTicket, createTicket, updateTicket]

package/src/routes/update.ts

@@ -2,9 +2,8 @@ import { BadRequestError, NotFoundError, UnauthorizedError, validateRequest, req
 import express, { Request, Response } from 'express'
 import { body } from 'express-validator'
 import { isValidObjectId } from 'mongoose'
-
 import Ticket from '../models/ticket'
-import TicketUpdatedPublisher from '../events/publishers/tickets/updated'
+import TicketUpdatedPublisher from '../events/publishers/updated'
 import natsClient from '../nats-client'
 
 const router = express.Router()
@@ -22,7 +21,7 @@ router.put('/api/tickets/:id', requireAuth, validateInput, validateRequest, asyn
   const { title, price } = req.body
   ticket.set({ title, price })
   await ticket.save()
-  await new TicketUpdatedPublisher(natsClient.client).publish({ id: ticket.id, title: ticket.title, price: ticket.price, owner: ticket.owner })
+  await new TicketUpdatedPublisher(natsClient.client).publish({ id: ticket.id, version: ticket.version, title: ticket.title, price: ticket.price, owner: ticket.owner })
   res.json(ticket)
 })
 

package/src/routes/__test__/find.test.ts

@@ -1,22 +0,0 @@
-
-import mongoose from 'mongoose'
-import request from 'supertest'
-import { getTokenCookie } from '@next-k8s/common'
-
-import app from '../../app'
-import { createTicket } from '../../test/utils'
-
-describe('[List Tickets] Route: GET /api/tickets', () => {
-  it('should return a list of tickets', async () => {
-    const cookie = await getTokenCookie({ id: new mongoose.Types.ObjectId().toHexString() })
-    await createTicket(app, cookie)
-    await createTicket(app, cookie, 'Test Event 2', 40000)
-    const list = await request(app)
-      .get('/api/tickets')
-      .send()
-      .expect(200)
-
-    expect(list.body.tickets).toBeDefined()
-    expect(list.body.tickets.length).toEqual(2)
-  })
-})

package/src/routes/find.ts

@@ -1,11 +0,0 @@
-import express, { Request, Response } from 'express'
-import Ticket from '../models/ticket'
-
-const router = express.Router()
-
-router.get('/api/tickets', async (req: Request, res: Response) => {
-  const tickets = await Ticket.find({})
-  res.send({ tickets })
-})
-
-export default router