From 97a10998ae987deea05497d99b04cc75d15744e0 Mon Sep 17 00:00:00 2001
From: Dan Holmes <dh@danielholmes.com>
Date: Fri, 4 Dec 2020 08:28:57 +0000
Subject: [PATCH] Refactor modules

---
 js-jasmine/src/aged_brie_update.js      | 18 +++++++-----------
 js-jasmine/src/backstage_pass_update.js | 24 ++++++++++--------------
 js-jasmine/src/shop.js                  |  4 ++--
 js-jasmine/src/standard_update.js       | 16 ++++++----------
 js-jasmine/src/sulfuras_update.js       | 12 ++++--------
 5 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/js-jasmine/src/aged_brie_update.js b/js-jasmine/src/aged_brie_update.js
index 427e00e7..f00f6745 100644
--- a/js-jasmine/src/aged_brie_update.js
+++ b/js-jasmine/src/aged_brie_update.js
@@ -1,12 +1,8 @@
-const agedBrie = {
-  regex_matcher: /aged brie/,
-  qualityChange: (sellIn) => {
-    if (sellIn <= 0) {
-      return 2;
-    } else {
-      return 1;
-    }
+exports.regex_matcher = /aged brie/;
+exports.qualityChange = function (sellIn, quality) {
+  if (sellIn <= 0) {
+    return 2;
+  } else {
+    return 1;
   }
-}
-
-module.exports = { agedBrie };
\ No newline at end of file
+};
diff --git a/js-jasmine/src/backstage_pass_update.js b/js-jasmine/src/backstage_pass_update.js
index edf93f2e..0c631c81 100644
--- a/js-jasmine/src/backstage_pass_update.js
+++ b/js-jasmine/src/backstage_pass_update.js
@@ -1,16 +1,12 @@
-const backstagePass = {
-  regex_matcher: /backstage pass/,
-  qualityChange: (sellIn, quality) => {
-    if (sellIn <= 0) {
-      return -quality;
-    } else if (sellIn <= 5) {
-      return 3;
-    } else if (sellIn <= 10) {
-      return 2;
-    } else {
-      return 1;
-    }
+exports.regex_matcher = /backstage pass/
+exports.qualityChange = function (sellIn, quality) {
+  if (sellIn <= 0) {
+    return -quality;
+  } else if (sellIn <= 5) {
+    return 3;
+  } else if (sellIn <= 10) {
+    return 2;
+  } else {
+    return 1;
   }
 }
-
-module.exports = { backstagePass };
\ No newline at end of file
diff --git a/js-jasmine/src/shop.js b/js-jasmine/src/shop.js
index b959b5b8..c947095f 100644
--- a/js-jasmine/src/shop.js
+++ b/js-jasmine/src/shop.js
@@ -3,7 +3,7 @@ const backstagePass = require('./backstage_pass_update.js')
 const agedBrie = require('./aged_brie_update.js')
 const sulfuras = require('./sulfuras_update.js')
 
-const itemTypes = [backstagePass.backstagePass, agedBrie.agedBrie, sulfuras.sulfuras]
+const itemTypes = [backstagePass, agedBrie, sulfuras]
 
 class Shop {
   constructor(items = []) {
@@ -34,7 +34,7 @@ class Shop {
         return item.quality += itemType.qualityChange(item.sellIn, item.quality);
       }
     }
-    return item.quality += standardItem.standardItem.qualityChange(item.sellIn);
+    return item.quality += standardItem.qualityChange(item.sellIn);
   }
 
   _updateItemSellIn(item) {
diff --git a/js-jasmine/src/standard_update.js b/js-jasmine/src/standard_update.js
index 524fb95f..75720d14 100644
--- a/js-jasmine/src/standard_update.js
+++ b/js-jasmine/src/standard_update.js
@@ -1,11 +1,7 @@
-const standardItem = {
-  qualityChange: (sellIn) => {
-    if (sellIn <= 0) {
-      return -2;
-    } else {
-      return -1;
-    }
+exports.qualityChange = function (sellIn) {
+  if (sellIn <= 0) {
+    return -2;
+  } else {
+    return -1;
   }
-}
-
-module.exports = { standardItem };
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/js-jasmine/src/sulfuras_update.js b/js-jasmine/src/sulfuras_update.js
index e117c256..c6b02301 100644
--- a/js-jasmine/src/sulfuras_update.js
+++ b/js-jasmine/src/sulfuras_update.js
@@ -1,8 +1,4 @@
-const sulfuras = {
-  regex_matcher: /sulfuras/,
-  qualityChange: () => {
-    return 0;
-  }
-}
-
-module.exports = { sulfuras };
\ No newline at end of file
+exports.regex_matcher = /sulfuras/;
+exports.qualityChange = function () {
+  return 0;
+};
\ No newline at end of file