@next-k8s/tickets 1.0.26 → 1.0.27

package/src/models/ticket.ts

@@ -2,9 +2,10 @@ 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;
 }
@@ -23,6 +24,10 @@ const ticketSchema = new mongoose.Schema({
   owner: {
     type: mongoose.Schema.Types.ObjectId,
     required: true
+  },
+
+  orderId: {
+    type: String
   }
 }, {
   toJSON: {

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

@@ -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

@@ -21,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