Joururi/spellsaurus
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented ESlint and passed down the rules

Browse Source
This commit is contained in:
Alexis
2021-01-20 19:07:56 +01:00
parent 615cced6ed
commit b318a88023
37 changed files with 2119 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
api/repositories/ingredient-repository.js
View File

@@ -1,17 +1,16 @@
'use strict'
// Bookshelf
const bookshelf = require('../database/bookshelf').bookshelf
const model = require('../models/ingredient-model')
const bookshelf = require('../database/bookshelf').bookshelf;
const model = require('../models/ingredient-model');
// Model validation
const Validator = require('jsonschema').Validator
const validator = new Validator()
const IngredientValidation = require("../validations/IngredientValidation")
validator.addSchema(IngredientValidation, "/IngredientValidation")
const Validator = require('jsonschema').Validator;
const validator = new Validator();
const IngredientValidation = require("../validations/IngredientValidation");
validator.addSchema(IngredientValidation, "/IngredientValidation");
// Validations
const isXSSAttempt = require('../functions').isXSSAttempt
const isEmptyObject = require('../functions').isEmptyObject
const isXSSAttempt = require('../functions').isXSSAttempt;
const isEmptyObject = require('../functions').isEmptyObject;
class IngredientRepository {
@@ -23,16 +22,16 @@ class IngredientRepository {
new model()
.fetchAll({ withRelated: ['spells'] })
.then(v => {
resolve(v.toJSON({ omitPivot: true }))
resolve(v.toJSON({ omitPivot: true }));
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "Il n'existe aucun ingrédient disponible.",
"code": 404,
});
})
})
});
});
}
@@ -42,16 +41,16 @@ class IngredientRepository {
.where({ 'id': id })
.fetch({ withRelated: ['spells'] })
.then(v => {
resolve(v.toJSON({ omitPivot: true }))
resolve(v.toJSON({ omitPivot: true }));
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "L'ingrédient en question n'a pas pu être trouvé.",
"code": 404,
});
})
})
});
});
}
getSpellsFromOne(id) {
@@ -60,16 +59,16 @@ class IngredientRepository {
.where({ 'id': id })
.fetch({ withRelated: ['spells', 'spells.schools', 'spells.variables', 'spells.ingredients', 'spells.schools.meta_schools'] })
.then(v => {
resolve(v.toJSON({ omitPivot: true }))
resolve(v.toJSON({ omitPivot: true }));
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "Les sortilèges liés à cet ingrédient n'ont pas pu être récupérés.",
"code": 404,
});
})
})
});
});
}
addOne(igr) {
@@ -99,24 +98,24 @@ class IngredientRepository {
transacting: t
})
.catch(err => {
throw err
})
throw err;
});
})
.then(v => {
return v.load(['spells'])
return v.load(['spells']);
})
.then(v => {
resolve(this.getOne(v.id))
resolve(this.getOne(v.id));
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "Une erreur d'insertion s'est produite.",
"code": 500,
});
})
});
}
})
});
}
updateOne(id, igr) {
@@ -150,33 +149,33 @@ class IngredientRepository {
transacting: t
})
.catch(err => {
console.log(err)
throw err
})
console.log(err);
throw err;
});
})
.then(v => {
return v.load(['spells'])
return v.load(['spells']);
})
.then(v => {
resolve(this.getOne(v.id))
resolve(this.getOne(v.id));
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "Une erreur d'insertion s'est produite.",
"code": 500,
});
})
});
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "L'ingrédient en question n'a pas été trouvé.",
"code": 404,
});
})
});
}
})
});
}
deleteOne(id) {
@@ -185,23 +184,23 @@ class IngredientRepository {
.where({ 'id': id })
.fetch({ require: true, withRelated: ['spells'] })
.then(v => {
v.spells().detach()
v.destroy()
v.spells().detach();
v.destroy();
})
.then(() => {
resolve({
'message': 'Ingredient with ID ' + id + ' successfully deleted !'
})
});
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "L'ingrédient en question n'a pas été trouvé.",
"code": 404,
});
})
})
});
});
}
}
module.exports = IngredientRepository
module.exports = IngredientRepository;

9
api/repositories/meta-school-repository.js
View File

@@ -1,6 +1,4 @@
'use strict'
// Bookshelf
const bookshelf = require('../database/bookshelf').bookshelf
const model = require('../models/meta-school-model')
// Model validation
@@ -9,9 +7,6 @@ const validator = new Validator()
const MetaSchoolValidation = require("../validations/MetaSchoolValidation")
validator.addSchema(MetaSchoolValidation, "/MetaSchoolValidation")
// Validations
const regexXSS = RegExp(/<[^>]*script/)
class MetaSchoolRepository {
constructor() {
@@ -28,7 +23,7 @@ class MetaSchoolRepository {
console.log(err)
reject({
"message": "Il n'existe aucune grande école disponible.",
"code": 404,
"code": 404
});
})
})
@@ -46,7 +41,7 @@ class MetaSchoolRepository {
console.log(err)
reject({
"message": "La grande école en question n'a pas pu être trouvée.",
"code": 404,
"code": 404
});
})
})

79
api/repositories/school-repository.js
View File

@@ -1,17 +1,16 @@
'use strict'
// Bookshelf
const bookshelf = require('../database/bookshelf').bookshelf
const model = require('../models/school-model')
const bookshelf = require('../database/bookshelf').bookshelf;
const model = require('../models/school-model');
// Model validation
const Validator = require('jsonschema').Validator
const validator = new Validator()
const SchoolValidation = require("../validations/SchoolValidation")
validator.addSchema(SchoolValidation, "/SchoolValidation")
const Validator = require('jsonschema').Validator;
const validator = new Validator();
const SchoolValidation = require("../validations/SchoolValidation");
validator.addSchema(SchoolValidation, "/SchoolValidation");
// Validations
const isXSSAttempt = require('../functions').isXSSAttempt
const isEmptyObject = require('../functions').isEmptyObject
const isXSSAttempt = require('../functions').isXSSAttempt;
const isEmptyObject = require('../functions').isEmptyObject;
class SchoolRepository {
@@ -23,7 +22,7 @@ class SchoolRepository {
new model()
.fetchAll({ withRelated: ['meta_schools'] })
.then(v => {
resolve(v.toJSON({ omitPivot: true }))
resolve(v.toJSON({ omitPivot: true }));
})
.catch(err => {
console.log(err);
@@ -31,8 +30,8 @@ class SchoolRepository {
"message": "Il n'existe aucune école disponible.",
"code": 404,
});
})
})
});
});
}
getOne(id) {
@@ -41,7 +40,7 @@ class SchoolRepository {
.where({ 'id': id })
.fetch({ withRelated: ['meta_schools'] })
.then(v => {
resolve(v.toJSON({ omitPivot: true }))
resolve(v.toJSON({ omitPivot: true }));
})
.catch(err => {
console.log(err);
@@ -49,8 +48,8 @@ class SchoolRepository {
"message": "L'école en question n'a pas pu être trouvée.",
"code": 404,
});
})
})
});
});
}
getSpellsFromOne(id) {
@@ -59,7 +58,7 @@ class SchoolRepository {
.where({ 'id': id })
.fetch({ withRelated: ['spells', 'spells.schools', 'spells.variables', 'spells.ingredients', 'spells.schools.meta_schools'] })
.then(v => {
resolve(v.toJSON({ omitPivot: true }))
resolve(v.toJSON({ omitPivot: true }));
})
.catch(err => {
console.log(err);
@@ -67,8 +66,8 @@ class SchoolRepository {
"message": "Les sortilèges de cette école n'ont pas pu être récupérés.",
"code": 404,
});
})
})
});
});
}
addOne(s) {
@@ -99,8 +98,8 @@ class SchoolRepository {
transacting: t
})
.catch(err => {
throw err
})
throw err;
});
})
.then(v => {
return v.load(['meta_schools']);
@@ -109,14 +108,14 @@ class SchoolRepository {
resolve(this.getOne(v.id));
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "Une erreur d'insertion s'est produite.",
"code": 500,
})
})
});
});
}
})
});
}
updateOne(id, s) {
@@ -151,23 +150,23 @@ class SchoolRepository {
transacting: t
})
.catch(err => {
console.log(err)
throw err
})
console.log(err);
throw err;
});
})
.then(v => {
return v.load(['meta_schools'])
return v.load(['meta_schools']);
})
.then(v => {
resolve(this.getOne(v.id))
resolve(this.getOne(v.id));
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "Une erreur d'insertion s'est produite.",
"code": 500,
})
})
});
});
})
.catch(err => {
console.log(err);
@@ -175,9 +174,9 @@ class SchoolRepository {
"message": "L'école en question n'a pas été trouvée.",
"code": 404,
});
})
});
}
})
});
}
deleteOne(id) {
@@ -186,13 +185,13 @@ class SchoolRepository {
.where({ 'id': id })
.fetch({ require: true, withRelated: ['spells', 'meta_schools'] })
.then(v => {
v.spells().detach()
v.destroy()
v.spells().detach();
v.destroy();
})
.then(() => {
resolve({
'message': 'School with ID ' + id + ' successfully deleted !'
})
});
})
.catch(err => {
console.log(err);
@@ -200,9 +199,9 @@ class SchoolRepository {
"message": "L'école en question n'a pas été trouvée.",
"code": 404,
});
})
})
});
});
}
}
module.exports = SchoolRepository
module.exports = SchoolRepository;

51
api/repositories/spell-repository.js
View File

@@ -23,12 +23,24 @@ class SpellRepository {
let query = new model();
if (name) { query.where('name', 'like', `%${name}%`) }
if (description) { query.where('description', 'like', `%${description}%`) }
if (level) { query.where({ 'level': level }) }
if (charge) { query.where({ 'charge': charge }) }
if (cost) { query.where({ 'cost': cost }) }
if (ritual) { query.where({ 'is_ritual': ritual }) }
if (name) {
query.where('name', 'like', `%${name}%`)
}
if (description) {
query.where('description', 'like', `%${description}%`)
}
if (level) {
query.where({ 'level': level })
}
if (charge) {
query.where({ 'charge': charge })
}
if (cost) {
query.where({ 'cost': cost })
}
if (ritual) {
query.where({ 'is_ritual': ritual })
}
query.fetchAll({ withRelated: ['schools.meta_schools', 'variables', 'ingredients', 'author'] })
.then(v => {
@@ -49,12 +61,24 @@ class SpellRepository {
let query = new model().where({ 'public': 1 })
if (name) { query.where('name', 'like', `%${name}%`) }
if (description) { query.where('description', 'like', `%${description}%`) }
if (level) { query.where({ 'level': level }) }
if (charge) { query.where({ 'charge': charge }) }
if (cost) { query.where({ 'cost': cost }) }
if (ritual) { query.where({ 'is_ritual': ritual }) }
if (name) {
query.where('name', 'like', `%${name}%`)
}
if (description) {
query.where('description', 'like', `%${description}%`)
}
if (level) {
query.where({ 'level': level })
}
if (charge) {
query.where({ 'charge': charge })
}
if (cost) {
query.where({ 'cost': cost })
}
if (ritual) {
query.where({ 'is_ritual': ritual })
}
query.fetchAll({ withRelated: ['schools.meta_schools', 'variables', 'ingredients', 'author'] })
.then(v => {
@@ -226,18 +250,21 @@ class SpellRepository {
let schools = spell.related('school');
return spell.schools().detach(schools, { transacting: t });
}
return spell
})
.tap(spell => {
if (s.variables) {
let variables = spell.related('variable');
return spell.variables().detach(variables, { transacting: t });
}
return spell;
})
.tap(spell => {
if (s.ingredients) {
let ingredients = spell.related('ingredient');
return spell.ingredients().detach(ingredients, { transacting: t });
}
return spell;
})
.tap(spell => {
return spell

6
api/repositories/user-repository.js
View File

@@ -360,7 +360,7 @@ class UserRepository {
})
.catch(err => {
// If the account already has an API key linked...
if (err.errno == 1062) {
if (err.errno === 1062) {
this.fetchAPIKey(user.uuid)
.then(old_api_key => {
reject({
@@ -473,7 +473,7 @@ class UserRepository {
})
// Unhandled errors
.catch(err => {
.catch(() => {
reject({
"message": "Une erreur inconnue est survenue.",
"code": 500,
@@ -541,7 +541,7 @@ class UserRepository {
resolve(v.toJSON({ omitPivot: true }));
})
.catch(err => {
console.log(err);
reject(err);
})
})
}

89
api/repositories/variable-repository.js
View File

@@ -1,17 +1,16 @@
'use strict'
// Bookshelf
const bookshelf = require('../database/bookshelf').bookshelf
const model = require('../models/variable-model')
const bookshelf = require('../database/bookshelf').bookshelf;
const model = require('../models/variable-model');
// Model validation
const Validator = require('jsonschema').Validator
const validator = new Validator()
const VariableValidation = require("../validations/VariableValidation")
validator.addSchema(VariableValidation, "/VariableValidation")
const Validator = require('jsonschema').Validator;
const validator = new Validator();
const VariableValidation = require("../validations/VariableValidation");
validator.addSchema(VariableValidation, "/VariableValidation");
// Validations
const isXSSAttempt = require('../functions').isXSSAttempt
const isEmptyObject = require('../functions').isEmptyObject
const isXSSAttempt = require('../functions').isXSSAttempt;
const isEmptyObject = require('../functions').isEmptyObject;
class VariableRepository {
@@ -23,16 +22,16 @@ class VariableRepository {
new model()
.fetchAll({ withRelated: ['spells'] })
.then(v => {
resolve(v.toJSON({ omitPivot: true }))
resolve(v.toJSON({ omitPivot: true }));
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "Il n'existe aucune variable disponible.",
"code": 404,
});
})
})
});
});
}
@@ -42,16 +41,16 @@ class VariableRepository {
.where({ 'id': id })
.fetch({ withRelated: ['spells'] })
.then(v => {
resolve(v.toJSON({ omitPivot: true }))
resolve(v.toJSON({ omitPivot: true }));
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "La variable en question n'a pas pu être trouvée.",
"code": 404,
});
})
})
});
});
}
getSpellsFromOne(id) {
@@ -60,16 +59,16 @@ class VariableRepository {
.where({ 'id': id })
.fetch({ withRelated: ['spells', 'spells.schools', 'spells.variables', 'spells.ingredients', 'spells.schools.meta_schools'] })
.then(v => {
resolve(v.toJSON({ omitPivot: true }))
resolve(v.toJSON({ omitPivot: true }));
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "Les sortilèges liés à cette variable n'ont pas pu être récupérés.",
"code": 404,
});
})
})
});
});
}
addOne(vr) {
@@ -98,24 +97,24 @@ class VariableRepository {
transacting: t
})
.catch(err => {
throw err
})
throw err;
});
})
.then(v => {
return v.load(['spells'])
return v.load(['spells']);
})
.then(v => {
resolve(this.getOne(v.id))
resolve(this.getOne(v.id));
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "Une erreur d'insertion s'est produite.",
"code": 500,
});
})
});
}
})
});
}
updateOne(id, vr) {
@@ -148,33 +147,33 @@ class VariableRepository {
transacting: t
})
.catch(err => {
console.log(err)
throw err
})
console.log(err);
throw err;
});
})
.then(v => {
return v.load(['spells'])
return v.load(['spells']);
})
.then(v => {
resolve(this.getOne(v.id))
resolve(this.getOne(v.id));
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "Une erreur d'insertion s'est produite.",
"code": 500,
});
})
});
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "La variable en question n'a pas été trouvée.",
"code": 404,
});
})
});
}
})
});
}
deleteOne(id) {
@@ -183,23 +182,23 @@ class VariableRepository {
.where({ 'id': id })
.fetch({ require: true, withRelated: ['spells'] })
.then(v => {
v.spells().detach()
v.destroy()
v.spells().detach();
v.destroy();
})
.then(() => {
resolve({
'message': 'Variable with ID ' + id + ' successfully deleted !'
})
});
})
.catch(err => {
console.log(err)
console.log(err);
reject({
"message": "La variable en question n'a pas été trouvée.",
"code": 404,
});
})
})
});
});
}
}
module.exports = VariableRepository
module.exports = VariableRepository;