Merged in thobson-review (pull request kawhyte#1)

Tim's Review and suggestions. * tweaks to data model and directory structure * new directories Approved-by: Kenny Whyte <[email protected]>
JDProfresh · Jun 24, 2019 · 7e765fe · 7e765fe
1 parent 82d5a84
commit 7e765fe
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 1,602 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
+*.log
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

diff --git a/routes/auth.js → controllers/auth.js b/routes/auth.js → controllers/auth.js
diff --git a/routes/home.js → controllers/home.js b/routes/home.js → controllers/home.js
diff --git a/routes/tickets.js → controllers/tickets.js b/routes/tickets.js → controllers/tickets.js
diff --git a/routes/users.js → controllers/users.js b/routes/users.js → controllers/users.js
diff --git a/logUncaughtExecptions.log b/logUncaughtExecptions.log
diff --git a/logfile.log b/logfile.log
diff --git a/models/tickets.js b/models/tickets.js
@@ -3,9 +3,8 @@ const Joi = require('joi');
 
 const ticketSchema = new mongoose.Schema({
     ticketNumber: {
-        type: String,
-        required: true,
-        minlength: 1
+        type: Number,
+        required: true
     },
     ticketName: {
         type: String,
@@ -14,10 +13,8 @@ const ticketSchema = new mongoose.Schema({
         maxlength: 50
     },
     topPrize: {
-        type: String,
-        required: true,
-        minlength: 1,
-        maxlength: 15
+        type: Number,
+        required: true
     },
     topPrizeRemaining: {
         type: String,
@@ -26,28 +23,20 @@ const ticketSchema = new mongoose.Schema({
         maxlength: 15
     },
     ticketCost: {
-        type: String,
-        required: true,
-        minlength: 1,
-        maxlength: 15
+        type: Number,
+        required: true
     },
     launchDate: {
-        type: String,
-        required: true,
-        minlength: 1,
-        maxlength: 15
+        type: Date,
+        required: true
     },
     endDate: {
-        type: String,
-        required: true,
-        minlength: 1,
-        maxlength: 15
+        type: Date,
+        required: true
     },
     redemptionDeadline: {
-        type: String,
-        required: true,
-        minlength: 1,
-        maxlength: 15
+        type: Date,
+        required: true
     },
     overallOddsOfWinning: {
         type: String,
@@ -64,26 +53,20 @@ const ticketSchema = new mongoose.Schema({
     State: {
         type: String,
         required: true,
-        minlength: 1,
-        maxlength: 15
+        minlength: 2,
+        maxlength: 2
     },
     remainingPrizes: {
-        type: String,
-        required: true,
-        minlength: 1,
-        maxlength: 15
+        type: Number,
+        required: true
     },
     totalPrizes: {
-        type: String,
-        required: true,
-        minlength: 1,
-        maxlength: 15
+        type: Number,
+        required: true
     },
     prizePercentage: {
-        type: String,
-        required: true,
-        minlength: 1,
-        maxlength: 15
+        type: Number,
+        required: true
     }
 
 });

diff --git a/lotto-data.json → seed_data/lotto-data.json b/lotto-data.json → seed_data/lotto-data.json
diff --git a/hash.js → tests/hash.js b/hash.js → tests/hash.js