Skip to content

Commit

Permalink
fixed linting errors on packages/medusa/src/services/user.js #531 (#543)
Browse files Browse the repository at this point in the history
* fixed linting errors on packages/medusa/src/services/user.js #531

* fix: resolving a few issues as raised in the PR, issue: #531

Co-authored-by: Sergiy Fomin <sergiy.fomin@sourcedgroup.com>
  • Loading branch information
FominSergiy and Sergiy Fomin authored Oct 13, 2021
1 parent 10f1d9d commit cf5b405
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 23 deletions.
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
/packages/medusa/src/services/swap.js
/packages/medusa/src/services/system-payment-provider.js
/packages/medusa/src/services/totals.js
/packages/medusa/src/services/user.js

/packages/medusa/src/subscribers/notification.js
/packages/medusa/src/subscribers/order.js
Expand Down
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ module.exports = {
plugins: [`eslint-plugin-prettier`],
extends: [`eslint:recommended`, `google`, `eslint-config-prettier`],
rules: {
"prettier/prettier": `error`,
curly: [2, `all`],
"new-cap": `off`,
"require-jsdoc": `off`,
Expand Down
4 changes: 2 additions & 2 deletions jest-transformer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const babelPreset = require(`babel-preset-medusa-package`)()
const babelPreset = require(`babel-preset-medusa-package`)();
module.exports = require(`babel-jest`).createTransformer({
...babelPreset,
})
});
19 changes: 8 additions & 11 deletions packages/medusa/src/services/gift-card.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Brackets } from "typeorm"

/**
* Provides layer to manipulate gift cards.
* @extends BaseService
* @implements BaseService
*/
class GiftCardService extends BaseService {
static Events = {
Expand Down Expand Up @@ -101,7 +101,7 @@ class GiftCardService extends BaseService {
.select(["gift_card.id"])
.where(where)
.andWhere(
new Brackets((qb) => {
new Brackets(qb => {
return qb
.where(`gift_card.code ILIKE :q`, { q: `%${q}%` })
.orWhere(`display_id::varchar(255) ILIKE :dId`, { dId: `${q}` })
Expand All @@ -111,14 +111,14 @@ class GiftCardService extends BaseService {

return giftCardRepo.findWithRelations(
rels,
raw.map((i) => i.id)
raw.map(i => i.id)
)
}
return giftCardRepo.findWithRelations(rels, query)
}

async createTransaction(data) {
return this.atomicPhase_(async (manager) => {
return this.atomicPhase_(async manager => {
const gctRepo = manager.getCustomRepository(this.giftCardTransactionRepo_)
const created = gctRepo.create(data)
const saved = await gctRepo.save(created)
Expand All @@ -132,7 +132,7 @@ class GiftCardService extends BaseService {
* @return {Promise<GiftCard>} the result of the create operation
*/
async create(giftCard) {
return this.atomicPhase_(async (manager) => {
return this.atomicPhase_(async manager => {
const giftCardRepo = manager.getCustomRepository(this.giftCardRepository_)

if (!giftCard.region_id) {
Expand Down Expand Up @@ -169,7 +169,6 @@ class GiftCardService extends BaseService {
/**
* Gets a gift card by id.
* @param {string} giftCardId - id of gift card to retrieve
* @param {object} config - optional values to include with gift card query
* @return {Promise<GiftCard>} the gift card
*/
async retrieve(giftCardId, config = {}) {
Expand Down Expand Up @@ -245,7 +244,7 @@ class GiftCardService extends BaseService {
* @return {Promise} the result of the update operation
*/
async update(giftCardId, update) {
return this.atomicPhase_(async (manager) => {
return this.atomicPhase_(async manager => {
const giftCardRepo = manager.getCustomRepository(this.giftCardRepository_)

const giftCard = await this.retrieve(giftCardId)
Expand Down Expand Up @@ -286,14 +285,12 @@ class GiftCardService extends BaseService {
* @return {Promise} the result of the delete operation
*/
async delete(giftCardId) {
return this.atomicPhase_(async (manager) => {
return this.atomicPhase_(async manager => {
const giftCardRepo = manager.getCustomRepository(this.giftCardRepository_)

const giftCard = await giftCardRepo.findOne({ where: { id: giftCardId } })

if (!giftCard) {
return Promise.resolve()
}
if (!giftCard) return Promise.resolve()

await giftCardRepo.softRemove(giftCard)

Expand Down
3 changes: 2 additions & 1 deletion packages/medusa/src/services/transaction.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { BaseService } from "medusa-interfaces"
import mongoose from "mongoose"
import _ from "lodash"

class TransactionService extends BaseService {
constructor() {
constructor({}) {
super()
}

Expand Down
21 changes: 14 additions & 7 deletions packages/medusa/src/services/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { BaseService } from "medusa-interfaces"

/**
* Provides layer to manipulate users.
* @implements BaseService
* @extends BaseService
*/
class UserService extends BaseService {
static Events = {
Expand Down Expand Up @@ -75,6 +75,7 @@ class UserService extends BaseService {
* Gets a user by id.
* Throws in case of DB Error and if user was not found.
* @param {string} userId - the id of the user to get.
* @param {Object} config - query configs
* @return {Promise<User>} the user document.
*/
async retrieve(userId, config = {}) {
Expand All @@ -99,6 +100,7 @@ class UserService extends BaseService {
* Gets a user by api token.
* Throws in case of DB Error and if user was not found.
* @param {string} apiToken - the token of the user to get.
* @param {string[]} relations - relations to include with the user
* @return {Promise<User>} the user document.
*/
async retrieveByApiToken(apiToken, relations = []) {
Expand All @@ -123,6 +125,7 @@ class UserService extends BaseService {
* Gets a user by email.
* Throws in case of DB Error and if user was not found.
* @param {string} email - the email of the user to get.
* @param {Object} config - query config
* @return {Promise<User>} the user document.
*/
async retrieveByEmail(email, config = {}) {
Expand All @@ -144,7 +147,7 @@ class UserService extends BaseService {
/**
* Hashes a password
* @param {string} password - the value to hash
* @return hashed password
* @return {string} hashed password
*/
async hashPassword_(password) {
const buf = await Scrypt.kdf(password, { logN: 1, r: 1, p: 1 })
Expand All @@ -155,6 +158,7 @@ class UserService extends BaseService {
* Creates a user with username being validated.
* Fails if email is not a valid format.
* @param {object} user - the user to create
* @param {string} password - user's password to hash
* @return {Promise} the result of create
*/
async create(user, password) {
Expand All @@ -177,7 +181,8 @@ class UserService extends BaseService {

/**
* Updates a user.
* @param {object} user - the user to create
* @param {object} userId - id of the user to update
* @param {object} update - the values to be updated on the user
* @return {Promise} the result of create
*/
async update(userId, update) {
Expand Down Expand Up @@ -228,7 +233,9 @@ class UserService extends BaseService {
// Should not fail, if user does not exist, since delete is idempotent
const user = await userRepo.findOne({ where: { id: userId } })

if (!user) return Promise.resolve()
if (!user) {
return Promise.resolve()
}

await userRepo.softRemove(user)

Expand All @@ -242,7 +249,7 @@ class UserService extends BaseService {
* password does not work.
* @param {string} userId - the userId to set password for
* @param {string} password - the old password to set
* @returns {Promise} the result of the update operation
* @return {Promise} the result of the update operation
*/
async setPassword_(userId, password) {
return this.atomicPhase_(async manager => {
Expand Down Expand Up @@ -270,8 +277,8 @@ class UserService extends BaseService {
* The token will be signed with the users current password hash as a secret
* a long side a payload with userId and the expiry time for the token, which
* is always 15 minutes.
* @param {User} user - the user to reset password for
* @returns {string} the generated JSON web token
* @param {string} userId - the id of the user to reset password for
* @return {string} the generated JSON web token
*/
async generateResetPasswordToken(userId) {
const user = await this.retrieve(userId)
Expand Down

0 comments on commit cf5b405

Please sign in to comment.