:recycle: refactor data generation | adding blurbs | moving user_media to response

backend/db/data-generator/config.json

@@ -2,22 +2,31 @@
     "mockOutputPath": "./db/generated",
     "magic": 10000,
     "total": 50,
-    "batchSize": 10,
-    "questions": 7,
+    "batchSize": 5,
     "percentageOfSeekers": 90,
     "scoreVals": [107, 414, 721, 1028, 1336, 1648, 2056],
     "header": "/**\n* GENERATED MOCK SIIMEE DATA\n*/",
     "possibleZipcodes": [
-        "90065",
         "90012",
+        "90040",
+        "90058",
+        "90064",
+        "90065",
         "90240",
+        "90274",
+        "90278",
+        "90280",
+        "90290",
+        "90291",
+        "90292",
+        "90293",
+        "90840",
+        "91001",
+        "91011",
         "91030",
         "91201",
         "91399",
         "91401",
-        "90840",
-        "91001",
-        "91011",
         "97075"
     ]
 }

backend/db/data-generator/generate.ipynb

@@ -168,7 +168,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.10"
+   "version": "3.6.9"
   },
   "orig_nbformat": 4
  },

backend/db/data-generator/index.js

@@ -2,7 +2,7 @@ const fs = require('fs')
 const config = require('./config')
 const random = require('./random')
 const classes = require('./classes')
-const score = require('./score')
+const mock = require('./mock')
 
 let batchCount = 1 // Counter to track how many things we've generated
 let extraProfilesToGenerate = 1
@@ -44,7 +44,6 @@ const write = async (batchNum, outputDataObject) => {
 }
 
 // Helper functions
-// const preComputedScores = score.precomputed
 const generate = (classObj, amount, meta) => {
     const instances = []
     for (let i = 0; i < amount; i++) {
@@ -115,23 +114,46 @@ const generateProfiles = jobPosterIds => {
 /**
  * Generate Responses
  */
+const _ZIPCODEKEY = 7
 const generateResponses = profiles => {
     // Generate responses first, before filling in details
     let responses = generate(
         classes.Response,
-        (config.batchSize + extraProfilesToGenerate) * config.questions,
+        (config.batchSize + extraProfilesToGenerate) * mock.response_keys.length,
         { starting: generatedResponseCount + config.batchSize },
     )
     profiles.forEach((profile, i) => {
-        const startingIndex = i * config.questions
-        for (let k = 0; k < config.questions; k++) {
+        const startingIndex = i * mock.response_keys.length
+        for (let k = 0; k < mock.response_keys.length; k++) {
             const resToEdit = responses[startingIndex + k]
             resToEdit.response_key_id = k + 1
             resToEdit.profile_id = profile.profile_id
-            resToEdit.val =
-                k + 1 == config.questions
-                    ? random.valFrom(config.possibleZipcodes)
-                    : random.valFrom(Object.values(possibleResponses))
+
+            if(resToEdit.response_key_id < _ZIPCODEKEY) {
+                resToEdit.val = random.valFrom(Object.values(possibleResponses))
+            }
+            else if(resToEdit.response_key_id == _ZIPCODEKEY) {
+                resToEdit.val = random.valFrom(config.possibleZipcodes)
+            }
+            else {
+                switch (resToEdit.response_key_id) {
+                    case 8:
+                        resToEdit.val = random.media()
+                        break
+                    case 9:
+                        resToEdit.val = random.language()
+                        break
+                    case 10:
+                        resToEdit.val = random.duration()
+                        break
+                    case 11:
+                        resToEdit.val = random.location()
+                        break
+                    case 12:
+                        resToEdit.val = random.blurb()
+                        break
+                }
+            }
         }
     })
     generatedResponseCount = generatedResponseCount + responses.length
@@ -142,11 +164,6 @@ const generateResponses = profiles => {
 /**
  * Our main generator loop
  */
-const writeBarrel = async () => {
-    await fs.writeFile(`${config.mockOutputPath}/index.js`, '', () => {})
-}
-// writeBarrel()
-
 for (
     let batch = config.batchSize;
     batch <= config.total;
@@ -169,19 +186,6 @@ for (
     const responses = generateResponses(profiles)
 
     write(config.batchSize * batchCount, { users, profiles, responses })
-
-    /**
-     * Write barrel export
-     */
-    // const filename = `_batch_${config.batchSize * batchCount}.js`
-    // fs.appendFile(
-    //     `${config.mockOutputPath}/index.js`,
-    //     `export * from './${filename}'\n`,
-    //     err => {
-    //         if (err) console.error(err)
-    //     },
-    // )
-
     batchCount++
 }
 

backend/db/data-generator/lorem.js

@@ -0,0 +1,230 @@
+/**
+ * @fileOverview Generates "Lorem ipsum" style text.
+ * @author rviscomi@gmail.com Rick Viscomi,
+ * 		tinsley@tinsology.net Mathew Tinsley
+ * @version 1.0
+ */
+
+/**
+ *	Copyright (c) 2009, Mathew Tinsley (tinsley@tinsology.net)
+ *	All rights reserved.
+ *
+ *	Redistribution and use in source and binary forms, with or without
+ *	modification, are permitted provided that the following conditions are met:
+ *		* Redistributions of source code must retain the above copyright
+ *		  notice, this list of conditions and the following disclaimer.
+ *		* Redistributions in binary form must reproduce the above copyright
+ *		  notice, this list of conditions and the following disclaimer in the
+ *		  documentation and/or other materials provided with the distribution.
+ *		* Neither the name of the organization nor the
+ *		  names of its contributors may be used to endorse or promote products
+ *		  derived from this software without specific prior written permission.
+ *
+ *	THIS SOFTWARE IS PROVIDED BY MATHEW TINSLEY ''AS IS'' AND ANY
+ *	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *	DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
+ *	DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ *	ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @class Jibborish generator.
+ */
+var LoremIpsum = function () {};
+
+/**
+ * Average number of words per sentence.
+ * @constant {number}
+ */
+LoremIpsum.WORDS_PER_SENTENCE_AVG = 24.460;
+
+/**
+ * Standard deviation of the number of words per sentence.
+ * @constant {number}
+ */
+LoremIpsum.WORDS_PER_SENTENCE_STD = 5.080;
+
+/**
+ * List of possible words.
+ * @constant {Array.string}
+ */
+LoremIpsum.WORDS = [
+		'lorem', 'ipsum', 'dolor', 'sit', 'amet', 'consectetur',
+		'adipiscing', 'elit', 'curabitur', 'vel', 'hendrerit', 'libero',
+		'eleifend', 'blandit', 'nunc', 'ornare', 'odio', 'ut',
+		'orci', 'gravida', 'imperdiet', 'nullam', 'purus', 'lacinia',
+		'a', 'pretium', 'quis', 'congue', 'praesent', 'sagittis', 
+		'laoreet', 'auctor', 'mauris', 'non', 'velit', 'eros',
+		'dictum', 'proin', 'accumsan', 'sapien', 'nec', 'massa',
+		'volutpat', 'venenatis', 'sed', 'eu', 'molestie', 'lacus',
+		'quisque', 'porttitor', 'ligula', 'dui', 'mollis', 'tempus',
+		'at', 'magna', 'vestibulum', 'turpis', 'ac', 'diam',
+		'tincidunt', 'id', 'condimentum', 'enim', 'sodales', 'in',
+		'hac', 'habitasse', 'platea', 'dictumst', 'aenean', 'neque',
+		'fusce', 'augue', 'leo', 'eget', 'semper', 'mattis', 
+		'tortor', 'scelerisque', 'nulla', 'interdum', 'tellus', 'malesuada',
+		'rhoncus', 'porta', 'sem', 'aliquet', 'et', 'nam',
+		'suspendisse', 'potenti', 'vivamus', 'luctus', 'fringilla', 'erat',
+		'donec', 'justo', 'vehicula', 'ultricies', 'varius', 'ante',
+		'primis', 'faucibus', 'ultrices', 'posuere', 'cubilia', 'curae',
+		'etiam', 'cursus', 'aliquam', 'quam', 'dapibus', 'nisl',
+		'feugiat', 'egestas', 'class', 'aptent', 'taciti', 'sociosqu',
+		'ad', 'litora', 'torquent', 'per', 'conubia', 'nostra',
+		'inceptos', 'himenaeos', 'phasellus', 'nibh', 'pulvinar', 'vitae',
+		'urna', 'iaculis', 'lobortis', 'nisi', 'viverra', 'arcu',
+		'morbi', 'pellentesque', 'metus', 'commodo', 'ut', 'facilisis',
+		'felis', 'tristique', 'ullamcorper', 'placerat', 'aenean', 'convallis',
+		'sollicitudin', 'integer', 'rutrum', 'duis', 'est', 'etiam',
+		'bibendum', 'donec', 'pharetra', 'vulputate', 'maecenas', 'mi',
+		'fermentum', 'consequat', 'suscipit', 'aliquam', 'habitant', 'senectus',
+		'netus', 'fames', 'quisque', 'euismod', 'curabitur', 'lectus',
+		'elementum', 'tempor', 'risus', 'cras'
+];
+
+/**
+ * Generate "Lorem ipsum" style words.
+ * @param num_words {number} Number of words to generate.
+ * @return {string} "Lorem ipsum..."
+ */
+LoremIpsum.prototype.generate = function (num_words) {
+	var words, ii, position, word, current, sentences, sentence_length, sentence;
+	
+	/**
+	 * @default 100
+	 */
+	num_words = num_words || 100;
+	
+	words = [LoremIpsum.WORDS[0], LoremIpsum.WORDS[1]];
+	num_words -= 2;
+	
+	for (ii = 0; ii < num_words; ii++) {
+		position = Math.floor(Math.random() * LoremIpsum.WORDS.length);
+		word = LoremIpsum.WORDS[position];
+		
+		if (ii > 0 && words[ii - 1] === word) {
+			ii -= 1;
+			
+		} else {
+			words[ii] = word;
+		}
+	}
+	
+	sentences = [];
+	current = 0;
+	
+	while (num_words > 0) {
+		sentence_length = this.getRandomSentenceLength();
+		
+		if (num_words - sentence_length < 4) {
+			sentence_length = num_words;
+		}
+		
+		num_words -= sentence_length;
+		
+		sentence = [];
+		
+		for (ii = current; ii < (current + sentence_length); ii++) {
+			sentence.push(words[ii]);
+		}
+		
+		sentence = this.punctuate(sentence);
+		current += sentence_length;
+		sentences.push(sentence.join(' '));
+	}
+	
+	return sentences.join(' ');
+};
+
+/**
+ * Insert commas and periods in the given sentence.
+ * @param {Array.string} sentence List of words in the sentence.
+ * @return {Array.string} Sentence with punctuation added.
+ */
+LoremIpsum.prototype.punctuate = function (sentence) {
+	var word_length, num_commas, ii, position;
+	
+	word_length = sentence.length;
+	
+	/* End the sentence with a period. */
+	sentence[word_length - 1] += '.';
+	
+	if (word_length < 4) {
+		return sentence;
+	}
+	
+	num_commas = this.getRandomCommaCount(word_length);
+	
+	for (ii = 0; ii <= num_commas; ii++) {
+		position = Math.round(ii * word_length / (num_commas + 1));
+		
+		if (position < (word_length - 1) && position > 0) {
+			/* Add the comma. */
+			sentence[position] += ',';
+		}
+	}
+	
+	/* Capitalize the first word in the sentence. */
+	sentence[0] = sentence[0].charAt(0).toUpperCase() + sentence[0].slice(1);
+	
+	return sentence;
+};
+
+/**
+ * Produces a random number of commas.
+ * @param {number} word_length Number of words in the sentence.
+ * @return {number} Random number of commas
+ */
+LoremIpsum.prototype.getRandomCommaCount = function (word_length) {
+	var base, average, standard_deviation;
+	
+	/* Arbitrary. */
+	base = 6;
+	
+	average = Math.log(word_length) / Math.log(base);
+	standard_deviation = average / base;
+	
+	return Math.round(this.gaussMS(average, standard_deviation));
+};
+
+/**
+ * Produces a random sentence length based on the average word length
+ * of an English sentence.
+ * @return {number} Random sentence length
+ */
+LoremIpsum.prototype.getRandomSentenceLength = function () {
+	return Math.round(
+			this.gaussMS(
+					LoremIpsum.WORDS_PER_SENTENCE_AVG,
+					LoremIpsum.WORDS_PER_SENTENCE_STD
+			)
+	);
+};
+
+/**
+ * Produces a random number.
+ * @return {number} Random number
+ */
+LoremIpsum.prototype.gauss = function () {
+	return (Math.random() * 2 - 1) +
+			(Math.random() * 2 - 1) +
+			(Math.random() * 2 - 1);
+};
+
+/**
+ * Produces a random number with Gaussian distribution.
+ * @param {number} mean
+ * @param {number} standard_deviation
+ * @return {number} Random number
+ */
+LoremIpsum.prototype.gaussMS = function (mean, standard_deviation) {
+	return Math.round(this.gauss() * standard_deviation + mean);
+};
+
+module.exports = {
+	LoremIpsum
+}

backend/db/mock.js → backend/db/data-generator/mock.js

@@ -8,29 +8,39 @@ module.exports = {
             tag_description: 'verified',
             is_active: true,
         },
+        {
+            tag_id: 2,
+            tag_category: 'reveal',
+            tag_description: 'verified',
+            is_active: true,
+        },
     ],
     tag_associations: [
         {
             tag_association_id: 1,
             profile_id: 1,
+            membership_id: null,
             tag_id: 1,
             is_deleted: false,
         },
         {
             tag_association_id: 2,
             profile_id: 2,
+            membership_id: null,
             tag_id: 1,
             is_deleted: false,
         },
         {
             tag_association_id: 3,
             profile_id: 3,
+            membership_id: null,
             tag_id: 1,
             is_deleted: false,
         },
         {
             tag_association_id: 4,
             profile_id: 5,
+            membership_id: null,
             tag_id: 1,
             is_deleted: false,
         },
@@ -79,10 +89,59 @@ module.exports = {
             response_key_prompt: 'what is your zip code',
             response_key_description: null,
         },
+        {
+            response_key_id: 8,
+            response_key_category: 'profile',
+            response_key_prompt: 'image',
+            response_key_description: null,
+        },
+        {
+            response_key_id: 9,
+            response_key_category: 'profile',
+            response_key_prompt: 'language',
+            response_key_description: null,
+        },
+        {
+            response_key_id: 10,
+            response_key_category: 'profile',
+            response_key_prompt: 'distance',
+            response_key_description: null,
+        },
+        {
+            response_key_id: 11,
+            response_key_category: 'profile',
+            response_key_prompt: 'duration',
+            response_key_description: null,
+        },
+        {
+            response_key_id: 12,
+            response_key_category: 'profile',
+            response_key_prompt: 'blurb',
+            response_key_description: null,
+        },
     ],
     responses: [],
     memberships: [],
     groupings: [],
     messages: [],
-    match_queues: [],
+    match_queues: [
+        {
+            match_queue_id: 1,
+            profile_id: 45,
+            target_id: 1,
+            is_deleted: false,
+        },
+        {
+            match_queue_id: 2,
+            profile_id: 45,
+            target_id: 2,
+            is_deleted: false,
+        },
+        {
+            match_queue_id: 3,
+            profile_id: 45,
+            target_id: 3,
+            is_deleted: false,
+        }
+    ],
 }

backend/db/data-generator/random.js

@@ -1,3 +1,5 @@
+const lipsum = require('./lorem')
+
 const randomNumber = max => {
     return Math.floor(Math.random() * max) < 1
         ? 1
@@ -45,10 +47,53 @@ const randomMedia = () => {
     return randomValFrom(stockimg)
 }
 
+const randomLang = () => {
+    const langs = [
+        'javascript',
+        'python',
+        'ruby',
+        'erlang',
+        'haskall',
+        'php',
+        'swift',
+        'rust',
+        'objective-c',
+        'common lisp',
+        'java',
+        'perl',
+        'cobol',
+        'fortran',
+        'julia',
+        'c#',
+        'go',
+        'c++',
+    ]
+    return randomValFrom(langs)
+}
+
+const randomDuration = () => {
+    const duration = ['full', 'part']
+    return randomValFrom(duration)
+}
+
+const randomLocation = () => {
+    const location = ['onsite', 'remote', 'flexible']
+    return randomValFrom(location)
+}
+
+const randomBlurb = () => {
+    const l = new lipsum.LoremIpsum()
+    return l.generate(randomNumber(50))
+}
+
 module.exports = {
     number: randomNumber,
     valFrom: randomValFrom,
     email: randomEmail,
     name: randomName,
-    media: randomMedia
+    media: randomMedia,
+    language: randomLang,
+    duration: randomDuration,
+    location: randomLocation,
+    blurb: randomBlurb
 }

backend/db/data-generator/score.js

@@ -1,75 +0,0 @@
-const cosineSimilarity = require('compute-cosine-similarity')
-
-const config = require('./config')
-
-const preComputedScores = {
-    100: {
-        100: 1000,
-        140: 872,
-        180: 675,
-        220: 518,
-        260: 406,
-        400: 215,
-    },
-    140: {
-        100: 872,
-        140: 1000,
-        180: 938,
-        220: 828,
-        260: 723,
-        400: 486,
-    },
-    180: {
-        100: 675,
-        140: 938,
-        180: 1000,
-        220: 968,
-        260: 906,
-        400: 706,
-    },
-    220: {
-        100: 518,
-        140: 828,
-        180: 968,
-        220: 1000,
-        260: 982,
-        400: 847,
-    },
-    260: {
-        100: 406,
-        140: 723,
-        180: 906,
-        220: 982,
-        260: 1000,
-        400: 928,
-    },
-    400: {
-        100: 215,
-        140: 486,
-        180: 706,
-        220: 847,
-        260: 928,
-        400: 1000,
-    },
-}
-const score2d = (a, b) => {
-    const aScorePlusBase = [100]
-    const bScorePlusBase = [100]
-    aScorePlusBase.push(a)
-    bScorePlusBase.push(b)
-    return Math.round(
-        Math.pow(cosineSimilarity(aScorePlusBase, bScorePlusBase), 10) *
-            config.magic,
-    )
-}
-
-// Uncomment to rerun precompute
-// config.scoreVals.forEach(val => {
-//     config.scoreVals.forEach(v => {
-//         preComputedScores[val][v] = score2d(val, v)
-//     })
-// })
-
-module.exports = {
-    precomputed: preComputedScores,
-}

backend/db/migrations/20210527174422_create_responses_table.js

@@ -3,7 +3,7 @@ exports.up = function (knex) {
         table.increments('response_id').primary()
         table.integer('profile_id').notNullable()
         table.integer('response_key_id').notNullable()
-        table.string('val').notNullable()
+        table.specificType('val', 'VARCHAR(1000)')
     })
 }
 

backend/db/migrations/20220403111037_create_tag_associations_table.js

@@ -2,6 +2,7 @@ exports.up = function (knex) {
     return knex.schema.createTable('tag_associations', function (table) {
         table.increments('tag_association_id').primary()
         table.integer('profile_id').notNullable()
+        table.integer('membership_id')
         table.integer('tag_id').notNullable()
         table.boolean('is_deleted').notNullable()
     })

backend/db/seeds/01-users.js

@@ -1,4 +1,4 @@
-const mock = require('../mock')
+const mock = require('../data-generator/mock')
 const fs = require('fs')
 
 let users = []

backend/db/seeds/02-profiles.js

@@ -1,4 +1,4 @@
-const mock = require('../mock')
+const mock = require('../data-generator/mock')
 const fs = require('fs')
 
 let profiles = []

backend/db/seeds/03-response_keys.js

@@ -1,4 +1,4 @@
-const mock = require('../mock')
+const mock = require('../data-generator/mock')
 const fs = require('fs')
 
 let response_keys = []

backend/db/seeds/04-responses.js

@@ -1,4 +1,4 @@
-const mock = require('../mock')
+const mock = require('../data-generator/mock')
 const fs = require('fs')
 
 let responses = []

backend/db/seeds/05-memberships.js

@@ -1,4 +1,4 @@
-const mock = require('../mock')
+const mock = require('../data-generator/mock')
 
 exports.seed = function (knex) {
     // Deletes ALL existing entries

backend/db/seeds/06-groupings.js

@@ -1,4 +1,4 @@
-const mock = require('../mock')
+const mock = require('../data-generator/mock')
 
 exports.seed = function (knex) {
     // Deletes ALL existing entries

backend/db/seeds/07-messages.js

@@ -1,4 +1,4 @@
-const mock = require('../mock')
+const mock = require('../data-generator/mock')
 
 exports.seed = function (knex) {
     // Deletes ALL existing entries

backend/db/seeds/09-match_queues.js

@@ -1,4 +1,4 @@
-const mock = require('../mock')
+const mock = require('../data-generator/mock')
 exports.seed = function (knex) {
     // Deletes ALL existing entries
     return knex('match_queues')

backend/db/seeds/12-tags.js

@@ -1,4 +1,4 @@
-const mock = require('../mock')
+const mock = require('../data-generator/mock')
 
 exports.seed = function (knex) {
     // Deletes ALL existing entries

backend/db/seeds/13-tag_associations.js

@@ -1,4 +1,4 @@
-const mock = require('../mock')
+const mock = require('../data-generator/mock')
 
 exports.seed = function (knex) {
     // Deletes ALL existing entries

frontend/src/utils/login.js

@@ -7,28 +7,18 @@ class Login {
         this.queue = null
         this.matches = null
     }
-    hasSurvey() {
-        return this.survey.length ? true : false 
-    }
-    hasQueue() {
-        return this.queue.length ? true : false 
-    }
-    hasMatches() {
-        return this.matches.length ? true : false 
-    }
 
     _setSurvey(survey) {
         this.survey = []
     }
 
     async getQueue() {
+        this.queue = null
         try {
             const queueList = await fetchQueueByProfileId(this.currentProfileId)
             const formatted = this._reformatProfiles(queueList)
-            this._setQueue(formatted)
+            this._SET_QUEUE(formatted)
         } catch (err) {
-            console.error('---')
-            this.queue = null
             console.error(err)
         }
     }
@@ -42,7 +32,7 @@ class Login {
         })
         return formattedList
     }
-    _setQueue(queue) {
+    _SET_QUEUE(queue) {
         this.queue = queue
     }