@next-k8s/tickets 1.0.25 → 1.0.28

package/coverage/lcov-report/src/routes/update.ts.html

@@ -25,14 +25,14 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>24/24</span>
+                <span class='fraction'>26/26</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>3/3</span>
+                <span class='fraction'>4/4</span>
             </div>
         
             
@@ -46,7 +46,7 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>20/20</span>
+                <span class='fraction'>21/21</span>
             </div>
         
             
@@ -92,26 +92,26 @@
 <a name='L27'></a><a href='#L27'>27</a>
 <a name='L28'></a><a href='#L28'>28</a>
 <a name='L29'></a><a href='#L29'>29</a>
-<a name='L30'></a><a href='#L30'>30</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
+<a name='L30'></a><a href='#L30'>30</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
@@ -120,14 +120,13 @@
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { BadRequestError, NotFoundError, UnauthorizedError, validateRequest, requireAuth } from '@next-k8s/common'
 import express, { Request, Response } from 'express'
 import { body } from 'express-validator'
 import { isValidObjectId } from 'mongoose'
-&nbsp;
 import Ticket from '../models/ticket'
-import TicketUpdatedPublisher from '../events/publishers/tickets/updated'
+import TicketUpdatedPublisher from '../events/publishers/updated'
 import natsClient from '../nats-client'
 &nbsp;
 const router = express.Router()
@@ -142,10 +141,11 @@ router.put('/api/tickets/:id', requireAuth, validateInput, validateRequest, asyn
   const ticket = await Ticket.findById(req.params.id)
   if (!ticket) throw new NotFoundError()
   if (ticket.owner.toHexString() !== req.currentUser!.id) throw new UnauthorizedError()
+  if (ticket.orderId) throw new BadRequestError('Ticket is reserved')
   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)
 })
 &nbsp;
@@ -157,7 +157,7 @@ export default router
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Sat Jul 09 2022 13:25:54 GMT-0500 (Central Daylight Time)
+                at Fri Jul 15 2022 21:51:54 GMT-0500 (Central Daylight Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/test/index.html

@@ -101,7 +101,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Sat Jul 09 2022 13:25:54 GMT-0500 (Central Daylight Time)
+                at Fri Jul 15 2022 21:51:54 GMT-0500 (Central Daylight Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/test/utils.ts.html

@@ -72,10 +72,10 @@
 <a name='L7'></a><a href='#L7'>7</a>
 <a name='L8'></a><a href='#L8'>8</a>
 <a name='L9'></a><a href='#L9'>9</a>
-<a name='L10'></a><a href='#L10'>10</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">4x</span>
+<a name='L10'></a><a href='#L10'>10</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -97,7 +97,7 @@ export const createTicket = (app: Express.Application, cookie?: string, title =
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Sat Jul 09 2022 13:25:54 GMT-0500 (Central Daylight Time)
+                at Fri Jul 15 2022 21:51:54 GMT-0500 (Central Daylight Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/ticket.ts.html

@@ -0,0 +1,220 @@
+
+<!doctype html>
+<html lang="en">
+
+<head>
+    <title>Code coverage report for ticket.ts</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="prettify.css" />
+    <link rel="stylesheet" href="base.css" />
+    <link rel="shortcut icon" type="image/x-icon" href="favicon.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <style type='text/css'>
+        .coverage-summary .sorter {
+            background-image: url(sort-arrow-sprite.png);
+        }
+    </style>
+</head>
+    
+<body>
+<div class='wrapper'>
+    <div class='pad1'>
+        <h1><a href="index.html">All files</a> ticket.ts</h1>
+        <div class='clearfix'>
+            
+            <div class='fl pad1y space-right2'>
+                <span class="strong">72.72% </span>
+                <span class="quiet">Statements</span>
+                <span class='fraction'>8/11</span>
+            </div>
+        
+            
+            <div class='fl pad1y space-right2'>
+                <span class="strong">100% </span>
+                <span class="quiet">Branches</span>
+                <span class='fraction'>0/0</span>
+            </div>
+        
+            
+            <div class='fl pad1y space-right2'>
+                <span class="strong">50% </span>
+                <span class="quiet">Functions</span>
+                <span class='fraction'>1/2</span>
+            </div>
+        
+            
+            <div class='fl pad1y space-right2'>
+                <span class="strong">72.72% </span>
+                <span class="quiet">Lines</span>
+                <span class='fraction'>8/11</span>
+            </div>
+        
+            
+        </div>
+        <p class="quiet">
+            Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
+        </p>
+        <template id="filterTemplate">
+            <div class="quiet">
+                Filter:
+                <input oninput="onInput()" type="search" id="fileSearch">
+            </div>
+        </template>
+    </div>
+    <div class='status-line medium'></div>
+    <pre><table class="coverage">
+<tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
+<a name='L2'></a><a href='#L2'>2</a>
+<a name='L3'></a><a href='#L3'>3</a>
+<a name='L4'></a><a href='#L4'>4</a>
+<a name='L5'></a><a href='#L5'>5</a>
+<a name='L6'></a><a href='#L6'>6</a>
+<a name='L7'></a><a href='#L7'>7</a>
+<a name='L8'></a><a href='#L8'>8</a>
+<a name='L9'></a><a href='#L9'>9</a>
+<a name='L10'></a><a href='#L10'>10</a>
+<a name='L11'></a><a href='#L11'>11</a>
+<a name='L12'></a><a href='#L12'>12</a>
+<a name='L13'></a><a href='#L13'>13</a>
+<a name='L14'></a><a href='#L14'>14</a>
+<a name='L15'></a><a href='#L15'>15</a>
+<a name='L16'></a><a href='#L16'>16</a>
+<a name='L17'></a><a href='#L17'>17</a>
+<a name='L18'></a><a href='#L18'>18</a>
+<a name='L19'></a><a href='#L19'>19</a>
+<a name='L20'></a><a href='#L20'>20</a>
+<a name='L21'></a><a href='#L21'>21</a>
+<a name='L22'></a><a href='#L22'>22</a>
+<a name='L23'></a><a href='#L23'>23</a>
+<a name='L24'></a><a href='#L24'>24</a>
+<a name='L25'></a><a href='#L25'>25</a>
+<a name='L26'></a><a href='#L26'>26</a>
+<a name='L27'></a><a href='#L27'>27</a>
+<a name='L28'></a><a href='#L28'>28</a>
+<a name='L29'></a><a href='#L29'>29</a>
+<a name='L30'></a><a href='#L30'>30</a>
+<a name='L31'></a><a href='#L31'>31</a>
+<a name='L32'></a><a href='#L32'>32</a>
+<a name='L33'></a><a href='#L33'>33</a>
+<a name='L34'></a><a href='#L34'>34</a>
+<a name='L35'></a><a href='#L35'>35</a>
+<a name='L36'></a><a href='#L36'>36</a>
+<a name='L37'></a><a href='#L37'>37</a>
+<a name='L38'></a><a href='#L38'>38</a>
+<a name='L39'></a><a href='#L39'>39</a>
+<a name='L40'></a><a href='#L40'>40</a>
+<a name='L41'></a><a href='#L41'>41</a>
+<a name='L42'></a><a href='#L42'>42</a>
+<a name='L43'></a><a href='#L43'>43</a>
+<a name='L44'></a><a href='#L44'>44</a>
+<a name='L45'></a><a href='#L45'>45</a>
+<a name='L46'></a><a href='#L46'>46</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import mongoose, { ObjectId } from 'mongoose'
+import { updateIfCurrentPlugin } from 'mongoose-update-if-current'
+&nbsp;
+interface TicketAttributes {
+  title: String;
+  price: Number;
+  owner: string;
+  createdAt?: Date;
+  updatedAt?: Date;
+}
+&nbsp;
+const ticketSchema = new mongoose.Schema({
+  title: {
+    type: String,
+    required: true
+  },
+&nbsp;
+  price: {
+    type: Number,
+    required: true
+  },
+&nbsp;
+  owner: {
+    type: mongoose.Schema.Types.ObjectId,
+    required: true
+  }
+}, {
+  toJSON: {
+<span class="fstat-no" title="function not covered" >    transform </span>(doc, ret) {
+<span class="cstat-no" title="statement not covered" >      ret.id = ret._id</span>
+<span class="cstat-no" title="statement not covered" >      delete ret._id</span>
+<span class="cstat-no" title="statement not covered" >      delete ret.password</span>
+    }
+  }
+})
+&nbsp;
+ticketSchema.set('versionKey', 'version')
+ticketSchema.plugin(updateIfCurrentPlugin)
+&nbsp;
+export const TicketModel = mongoose.model('Ticket', ticketSchema)
+export default class Ticket extends TicketModel {
+  constructor(attributes: TicketAttributes) {
+    super(attributes)
+  }
+}
+&nbsp;</pre></td></tr></table></pre>
+
+                <div class='push'></div><!-- for sticky footer -->
+            </div><!-- /wrapper -->
+            <div class='footer quiet pad2 space-top1 center small'>
+                Code coverage generated by
+                <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
+                at Tue Jul 12 2022 16:05:46 GMT-0500 (Central Daylight Time)
+            </div>
+        <script src="prettify.js"></script>
+        <script>
+            window.onload = function () {
+                prettyPrint();
+            };
+        </script>
+        <script src="sorter.js"></script>
+        <script src="block-navigation.js"></script>
+    </body>
+</html>
+    

package/coverage/lcov.info

@@ -0,0 +1,282 @@
+TN:
+SF:src/app.ts
+FN:18,(anonymous_8)
+FN:18,(anonymous_9)
+FNF:2
+FNH:0
+FNDA:0,(anonymous_8)
+FNDA:0,(anonymous_9)
+DA:1,3
+DA:2,3
+DA:3,3
+DA:4,3
+DA:6,3
+DA:7,3
+DA:9,3
+DA:11,3
+DA:12,3
+DA:13,3
+DA:14,3
+DA:16,3
+DA:17,9
+DA:18,3
+DA:19,3
+DA:21,3
+LF:16
+LH:16
+BRF:0
+BRH:0
+end_of_record
+TN:
+SF:src/events/listeners/_queue-group-name.ts
+FNF:0
+FNH:0
+DA:1,2
+LF:1
+LH:1
+BRF:0
+BRH:0
+end_of_record
+TN:
+SF:src/events/listeners/order-cancelled.ts
+FN:8,(anonymous_8)
+FN:12,(anonymous_9)
+FNF:2
+FNH:2
+FNDA:3,(anonymous_8)
+FNDA:3,(anonymous_9)
+DA:1,1
+DA:3,1
+DA:4,1
+DA:6,1
+DA:8,1
+DA:9,3
+DA:10,3
+DA:13,3
+DA:14,3
+DA:15,3
+DA:16,3
+DA:18,3
+DA:19,3
+DA:20,3
+DA:24,1
+LF:15
+LH:15
+BRDA:14,0,0,0
+BRF:1
+BRH:0
+end_of_record
+TN:
+SF:src/events/listeners/order-created.ts
+FN:8,(anonymous_8)
+FN:12,(anonymous_9)
+FNF:2
+FNH:2
+FNDA:3,(anonymous_8)
+FNDA:3,(anonymous_9)
+DA:1,1
+DA:3,1
+DA:4,1
+DA:6,1
+DA:8,1
+DA:9,3
+DA:10,3
+DA:13,3
+DA:14,3
+DA:15,3
+DA:16,3
+DA:18,3
+DA:19,3
+DA:20,3
+DA:24,1
+LF:15
+LH:15
+BRDA:14,0,0,0
+BRF:1
+BRH:0
+end_of_record
+TN:
+SF:src/events/publishers/created.ts
+FN:3,(anonymous_0)
+FNF:1
+FNH:1
+FNDA:11,(anonymous_0)
+DA:1,3
+DA:3,3
+DA:4,11
+DA:7,3
+LF:4
+LH:4
+BRF:0
+BRH:0
+end_of_record
+TN:
+SF:src/events/publishers/updated.ts
+FN:3,(anonymous_0)
+FNF:1
+FNH:1
+FNDA:7,(anonymous_0)
+DA:1,5
+DA:3,5
+DA:4,7
+DA:7,5
+LF:4
+LH:4
+BRF:0
+BRH:0
+end_of_record
+TN:
+SF:src/models/ticket.ts
+FN:33,(anonymous_1)
+FN:46,(anonymous_2)
+FNF:2
+FNH:2
+FNDA:16,(anonymous_1)
+FNDA:38,(anonymous_2)
+DA:1,6
+DA:2,6
+DA:12,6
+DA:34,16
+DA:35,16
+DA:36,16
+DA:41,6
+DA:42,6
+DA:44,6
+DA:45,6
+DA:47,38
+LF:11
+LH:11
+BRF:0
+BRH:0
+end_of_record
+TN:
+SF:src/routes/create.ts
+FN:16,(anonymous_8)
+FN:16,(anonymous_9)
+FNF:2
+FNH:2
+FNDA:11,(anonymous_8)
+FNDA:11,(anonymous_9)
+DA:1,3
+DA:2,3
+DA:3,3
+DA:5,3
+DA:6,3
+DA:7,3
+DA:9,3
+DA:11,3
+DA:16,11
+DA:17,11
+DA:18,11
+DA:19,11
+DA:20,11
+DA:21,11
+DA:24,3
+LF:15
+LH:15
+BRF:0
+BRH:0
+end_of_record
+TN:
+SF:src/routes/get.ts
+FN:9,(anonymous_8)
+FN:9,(anonymous_9)
+FN:14,(anonymous_10)
+FN:14,(anonymous_11)
+FNF:4
+FNH:4
+FNDA:1,(anonymous_8)
+FNDA:1,(anonymous_9)
+FNDA:4,(anonymous_10)
+FNDA:4,(anonymous_11)
+DA:1,3
+DA:2,3
+DA:3,3
+DA:5,3
+DA:7,3
+DA:9,3
+DA:10,1
+DA:11,1
+DA:14,4
+DA:15,4
+DA:16,3
+DA:17,3
+DA:18,2
+DA:21,3
+LF:14
+LH:14
+BRDA:15,0,0,1
+BRDA:17,1,0,1
+BRF:2
+BRH:2
+end_of_record
+TN:
+SF:src/routes/index.ts
+FNF:0
+FNH:0
+DA:1,3
+DA:2,3
+DA:3,3
+DA:5,3
+LF:4
+LH:4
+BRF:0
+BRH:0
+end_of_record
+TN:
+SF:src/routes/update.ts
+FN:16,(anonymous_8)
+FN:16,(anonymous_9)
+FNF:2
+FNH:2
+FNDA:5,(anonymous_8)
+FNDA:5,(anonymous_9)
+DA:1,3
+DA:2,3
+DA:3,3
+DA:4,3
+DA:5,3
+DA:6,3
+DA:7,3
+DA:9,3
+DA:11,3
+DA:16,5
+DA:17,5
+DA:18,4
+DA:19,4
+DA:20,3
+DA:21,2
+DA:22,1
+DA:23,1
+DA:24,1
+DA:25,1
+DA:26,1
+DA:29,3
+LF:21
+LH:21
+BRDA:17,0,0,1
+BRDA:19,1,0,1
+BRDA:20,2,0,1
+BRDA:21,3,0,1
+BRF:4
+BRH:4
+end_of_record
+TN:
+SF:src/test/utils.ts
+FN:3,(anonymous_1)
+FNF:1
+FNH:1
+FNDA:8,(anonymous_1)
+DA:1,3
+DA:3,3
+DA:4,8
+LF:3
+LH:3
+BRDA:3,0,0,7
+BRDA:3,1,0,7
+BRDA:3,2,0,8
+BRDA:6,3,0,8
+BRDA:6,3,1,0
+BRF:5
+BRH:4
+end_of_record

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-k8s/tickets",
-  "version": "1.0.25",
+  "version": "1.0.28",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
@@ -34,7 +34,7 @@
     ]
   },
   "dependencies": {
-    "@next-k8s/common": "^0.1.33",
+    "@next-k8s/common": "^0.1.36",
     "@types/cookie-session": "^2.0.44",
     "@types/express": "^4.17.13",
     "@types/jsonwebtoken": "^8.5.8",
@@ -46,6 +46,7 @@
     "jsonwebtoken": "^8.5.1",
     "mongoose": "^6.3.5",
     "mongoose-bcrypt": "^1.9.0",
+    "mongoose-update-if-current": "^1.4.0",
     "node-nats-streaming": "^0.3.2",
     "ts-node-dev": "^2.0.0",
     "typescript": "^4.7.3"
@@ -61,5 +62,5 @@
     "supertest": "^6.2.3",
     "ts-jest": "^28.0.4"
   },
-  "gitHead": "e182566d2a65f731ed1ae69091a1336359a99c0b"
+  "gitHead": "b2b69ab41a506a1496d8fa6aa5c2e150504bdde2"
 }