Update to work with new custom draft system.

dekkerglen · Jan 12, 2020 · 8ac0bbb · 8ac0bbb
1 parent 3ea6733
commit 8ac0bbb
Show file tree

Hide file tree

Showing 8 changed files with 331 additions and 358 deletions.
diff --git a/__tests__/serverjs/draftutil.test.js b/__tests__/serverjs/draftutil.test.js
@@ -2,8 +2,9 @@ const carddb = require('../../serverjs/cards');
 const fixturesPath = 'fixtures';
 const cubefixture = require('../../fixtures/examplecube');
 const sinon = require('sinon');
-const methods = require('../../serverjs/draftutil');
+const methods = require('../../dist/util/draftutil');
 let CardRating = require('../../models/cardrating');
+let Draft = require('../../models/draft');
 
 import Filter from '../../src/util/Filter';
 import { expectOperator } from '../helpers';
@@ -133,9 +134,10 @@ describe('getDraftFormat', () => {
   });
 });
 
-describe('createDraft', () => {
-  let format, cards, bots, seats;
+describe('populateDraft', () => {
+  let draft, format, cards, bots, seats;
   beforeAll(() => {
+    draft = new Draft();
     format = [];
     cards = [];
     bots = [];
@@ -146,29 +148,29 @@ describe('createDraft', () => {
     cards = [];
     bots = ['fakebot'];
     expect(() => {
-      methods.createDraft(format, cards, bots, seats);
+      methods.populateDraft(draft, format, cards, bots, seats);
     }).toThrow(/no cards/);
   });
 
   it('returns an error if no bots supplied', () => {
     cards = ['mockcard'];
     bots = [];
     expect(() => {
-      methods.createDraft(format, cards, bots, seats);
+      methods.populateDraft(draft, format, cards, bots, seats);
     }).toThrow(/no bots/);
   });
 
   it('returns an error if seats < 2', () => {
     cards = ['mockcards'];
     bots = ['mockbot'];
     expect(() => {
-      methods.createDraft(format, cards, bots, 1);
+      methods.populateDraft(draft, format, cards, bots, 1);
     }).toThrow(/invalid seats/);
     expect(() => {
-      methods.createDraft(format, cards, bots, null);
+      methods.populateDraft(draft, format, cards, bots, null);
     }).toThrow(/invalid seats/);
     expect(() => {
-      methods.createDraft(format, cards, bots, -1);
+      methods.populateDraft(draft, format, cards, bots, -1);
     }).toThrow(/invalid seats/);
   });
 
@@ -183,7 +185,7 @@ describe('createDraft', () => {
       cards = exampleCube.cards;
       bots = ['mockbot'];
       format = methods.getDraftFormat({ id: -1, packs: 1, cards: 15, seats: seats }, exampleCube);
-      let draft = methods.createDraft(format, cards, bots, 8);
+      methods.populateDraft(draft, format, cards, bots, 8);
       expect(draft.pickNumber).toEqual(1);
       expect(draft.packNumber).toEqual(1);
       expect(draft).toHaveProperty('packs');

diff --git a/package-lock.json b/package-lock.json
diff --git a/rollup.config.js b/rollup.config.js
@@ -1,5 +1,5 @@
 export default {
-  input: ['src/util/Filter.js', 'src/util/Card.js'],
+  input: ['src/util/Filter.js', 'src/util/Card.js', 'src/util/draftutil.js', 'src/util/Util.js'],
   output: {
     dir: 'dist/util',
     format: 'cjs',

diff --git a/routes/cube_routes.js b/routes/cube_routes.js
@@ -12,7 +12,7 @@ var {
   build_id_query,
   get_cube_id,
 } = require('../serverjs/cubefn.js');
-const draftutil = require('../serverjs/draftutil.js');
+const draftutil = require('../dist/util/draftutil.js');
 const cardutil = require('../dist/util/Card.js');
 const carddb = require('../serverjs/cards.js');
 carddb.initializeCardDb();
@@ -1638,7 +1638,8 @@ router.post('/startdraft/:id', async (req, res) => {
     });
     let bots = draftutil.getDraftBots(params);
     let format = draftutil.getDraftFormat(params, cube);
-    let draft = draftutil.createDraft(format, draftcards, bots, params.seats);
+    let draft = new Draft();
+    draftutil.populateDraft(draft, format, draftcards, bots, params.seats);
     draft.cube = cube._id;
     await draft.save();
     return res.redirect('/cube/draft/' + draft._id);