Skip to content
This repository has been archived by the owner on May 10, 2023. It is now read-only.

Commit

Permalink
Remove useSwipeReview from server
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelKohler committed Jul 24, 2021
1 parent f6f31c5 commit 9c569a7
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 14 deletions.
1 change: 0 additions & 1 deletion server/lib/models/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ module.exports = (sequelize, DataTypes) => {
// given the structures of our queries we need to do. If somebody wants to do it, go for it!
// For now, this takes a comma-separated list of language codes
languages: DataTypes.STRING,
useSwipeReview: DataTypes.BOOLEAN,
}, {});

return User;
Expand Down
12 changes: 5 additions & 7 deletions server/lib/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,18 @@ module.exports = {

async function get(email) {
debug('GETTING_USER', email);
const [user] = await User.findAll({ where: { email }});
const [user] = await User.findAll({ where: { email } });
const userLanguages = user.languages || '';
return {
email: user.email,
languages: userLanguages.split(',').filter(Boolean),
settings: {
useSwipeReview: user.useSwipeReview || false,
},
settings: {},
};
}

function createUserIfNecessary(email) {
debug('CREATE_USER_IF_NECESSARY', email);
return User.findOrCreate({ where: { email }});
return User.findOrCreate({ where: { email } });
}

function updateSetting(email, key, value) {
Expand All @@ -49,7 +47,7 @@ function updateSetting(email, key, value) {

async function addLanguage(email, language) {
debug('ADDING_LANGUAGE', email, language);
const [user] = await User.findAll({ where: { email }});
const [user] = await User.findAll({ where: { email } });
if (!user) {
return;
}
Expand All @@ -75,7 +73,7 @@ async function addLanguage(email, language) {

async function removeLanguage(email, language) {
debug('REMOVING_LANGUAGE', email, language);
const [user] = await User.findAll({ where: { email }});
const [user] = await User.findAll({ where: { email } });
if (!user) {
return;
}
Expand Down
22 changes: 22 additions & 0 deletions server/migrations/20210724095500-remove-useSwipeReview.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
'use strict';

module.exports = {
up: (queryInterface) => {
return queryInterface.removeColumn(
'Users',
'useSwipeReview',
);

},

down: (queryInterface, Sequelize) => {
return queryInterface.addColumn(
'Users',
'useSwipeReview',
{
type: Sequelize.BOOLEAN,
defaultValue: false,
},
);
},
};
9 changes: 3 additions & 6 deletions server/tests/lib/users.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import users from '../../lib/users';
const exampleUserRecord = {
id: '1',
email: 'foo@example.com',
useSwipeReview: true,
languages: '',
};

Expand All @@ -31,16 +30,14 @@ test.serial('get: should get user', async (t) => {
t.deepEqual(user, {
email: 'foo@example.com',
languages: [],
settings: {
useSwipeReview: true,
},
settings: {},
});
});

test.serial('updateSetting: should update user', async (t) => {
await users.updateSetting('foo@example.com', 'useSwipeReview', true);
await users.updateSetting('foo@example.com', 'foo', true);
t.true(User.update.calledWith({
useSwipeReview: true,
foo: true,
}, {
where: {
email: 'foo@example.com',
Expand Down

0 comments on commit 9c569a7

Please sign in to comment.