Merge pull request #14 from bschultz/reduce-duplicate-code

Refactor duplicate account "creation" code

Author: versx

src/controllers/instances/iv.js

@@ -20,7 +20,7 @@ class IVInstanceController {
     constructor(name, polygon, pokemonList, minLevel, maxLevel, ivQueueLimit) {
         this.name = name;
         this.polygon = polygon;
-        this.pokemonList = pokemonList,
+        this.pokemonList = pokemonList;
         this.minLevel = minLevel;
         this.maxLevel = maxLevel;
         this.ivQueueLimit = ivQueueLimit || 100;

src/models/account.js

@@ -10,7 +10,7 @@ const db = new MySQLConnector(config.db);
 class Account {
 
     /**
-     * Initalize new Account object.
+     * Initialize new Account object.
      * @param username 
      * @param password 
      * @param firstWarningTimestamp 
@@ -79,10 +79,41 @@ class Account {
         }
     }
 
+    /**
+     * @param results
+     * @returns {Account|null}
+     */
+    static createFromDbResults(results) {
+        if (results && results.length > 0) {
+            const result = results[0];
+            return new Account(
+              result.username,
+              result.password,
+              result.first_warning_timestamp,
+              result.failed_timestamp,
+              result.failed,
+              result.level,
+              result.last_encounter_lat,
+              result.last_encounter_lon,
+              result.last_encounter_time,
+              result.spins,
+              result.tutorial,
+              result.creation_timestamp_ms,
+              result.warn,
+              result.warn_expire_ms,
+              result.warn_message_acknowledged,
+              result.suspended_message_acknowledged,
+              result.was_suspended,
+              result.banned
+            );
+        }
+        return null;
+    }
+
     /**
      * Get new account between minimum and maximum level.
-     * @param minLevel 
-     * @param maxLevel 
+     * @param minLevel
+     * @param maxLevel
      */
     static async getNewAccount(minLevel, maxLevel) {
         let sql = `
@@ -98,34 +129,12 @@ class Account {
         `;
         let results = await db.query(sql, [minLevel, maxLevel])
             .then(x => x)
-            .catch(err => { 
+            .catch(err => {
                 console.error('[Account] Failed to get new Account', err);
                 return null;
             });
-        if (results && results.length > 0) {
-            const result = results[0];
-            return new Account(
-                result.username,
-                result.password,
-                result.first_warning_timestamp,
-                result.failed_timestamp,
-                result.failed,
-                result.level,
-                result.last_encounter_lat,
-                result.last_encounter_lon,
-                result.last_encounter_time,
-                result.spins,
-                result.tutorial,
-                result.creation_timestamp_ms,
-                result.warn,
-                result.warn_expire_ms,
-                result.warn_message_acknowledged,
-                result.suspended_message_acknowledged,
-                result.was_suspended,
-                result.banned
-            );
-        }
-        return null;
+
+        return Account.createFromDbResults(results);
     }
 
     /**
@@ -149,30 +158,8 @@ class Account {
                 console.error('[Account] Failed to get Account with username', username, 'Error:', err);
                 return null;
             });
-        if (results && results.length > 0) {
-            const result = results[0];
-            return new Account(
-                result.username,
-                result.password,
-                result.first_warning_timestamp,
-                result.failed_timestamp,
-                result.failed,
-                result.level,
-                result.last_encounter_lat,
-                result.last_encounter_lon,
-                result.last_encounter_time,
-                result.spins,
-                result.tutorial,
-                result.creation_timestamp_ms,
-                result.warn,
-                result.warn_expire_ms,
-                result.warn_message_acknowledged,
-                result.suspended_message_acknowledged,
-                result.was_suspended,
-                result.banned
-            );
-        }
-        return null;
+
+        return Account.createFromDbResults(results);
     }
 
     /**
@@ -440,4 +427,4 @@ class Account {
 }
 
 // Export the class
-module.exports = Account;
+module.exports = Account;