Skip to content

Commit

Permalink
lint and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShubhamPalriwala
ShubhamPalriwala committed Feb 17, 2022
1 parent 6a19362 commit ab96f8d
Show file tree
Hide file tree
Showing 49 changed files with 701 additions and 652 deletions.
95 changes: 47 additions & 48 deletions data/datacreator.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ import SecurityAnswerModel from 'models/securityAnswer'
import SecurityQuestionModel from 'models/securityQuestion'
import UserModel from 'models/user'
import WalletModel from 'models/wallet'
import * as models from '../models/index'
import { Address, Card, Challenge, Delivery, Memory, Product, Recycle, SecurityQuestion, User } from './types'
import { Address, Card, Challenge, Delivery, Memory, Product, SecurityQuestion, User } from './types'
const datacache = require('./datacache')
const config = require('config')
const utils = require('../lib/utils')
Expand Down Expand Up @@ -137,8 +136,8 @@ async function createUsers () {
async function createWallet () {
const users = await loadStaticData('users')
return await Promise.all(
users.map((user: User, index: number) => {
return WalletModel.create({
users.map(async (user: User, index: number) => {
return await WalletModel.create({
UserId: index + 1,
balance: user.walletBalance !== undefined ? user.walletBalance : 0
}).catch((err: unknown) => {
Expand Down Expand Up @@ -169,8 +168,8 @@ async function createDeliveryMethods () {
}

function createAddresses (UserId: number, addresses: Address[]) {
addresses.map((address) => {
return AddressModel.create({
addresses.map(async (address) => {
return await AddressModel.create({
UserId: UserId,
country: address.country,
fullName: address.fullName,
Expand All @@ -186,11 +185,11 @@ function createAddresses (UserId: number, addresses: Address[]) {
}

async function createCards (UserId: number, cards: Card[]) {
return await Promise.all(cards.map((card) => {
return CardModel.create({
return await Promise.all(cards.map(async (card) => {
return await CardModel.create({
UserId: UserId,
fullName: card.fullName,
cardNum: card.cardNum,
cardNum: Number(card.cardNum),
expMonth: card.expMonth,
expYear: card.expYear
}).catch((err: unknown) => {
Expand All @@ -199,8 +198,8 @@ async function createCards (UserId: number, cards: Card[]) {
}))
}

function deleteUser (userId: number) {
return UserModel.destroy({ where: { id: userId } }).catch((err: unknown) => {
async function deleteUser (userId: number) {
return await UserModel.destroy({ where: { id: userId } }).catch((err: unknown) => {
logger.error(`Could not perform soft delete for the user ${userId}: ${utils.getErrorMessage(err)}`)
})
}
Expand All @@ -221,7 +220,7 @@ async function createRandomFakeUsers () {
}

return await Promise.all(new Array(config.get('application.numberOfRandomFakeUsers')).fill(0).map(
() => UserModel.create({
async () => await UserModel.create({
email: getGeneratedRandomFakeUserEmail(),
password: makeRandomString(5)
})
Expand All @@ -230,8 +229,8 @@ async function createRandomFakeUsers () {

async function createQuantity () {
return await Promise.all(
config.get('products').map((product: Product, index: number) => {
return QuantityModel.create({
config.get('products').map(async (product: Product, index: number) => {
return await QuantityModel.create({
ProductId: index + 1,
quantity: product.quantity !== undefined ? product.quantity : Math.floor(Math.random() * 70 + 30),
limitPerUser: product.limitPerUser ?? null
Expand All @@ -251,22 +250,22 @@ async function createMemories () {
}).catch((err: unknown) => {
logger.error(`Could not create memory: ${utils.getErrorMessage(err)}`)
}),
...utils.thaw(config.get('memories')).map((memory: Memory) => {
...utils.thaw(config.get('memories')).map(async (memory: Memory) => {
let tmpImageFileName = memory.image
if (utils.isUrl(memory.image)) {
const imageUrl = memory.image
tmpImageFileName = utils.extractFilename(memory.image)
utils.downloadToFile(imageUrl, 'frontend/dist/frontend/assets/public/images/uploads/' + tmpImageFileName)
}
if (memory.geoStalkingMetaSecurityQuestion && memory.geoStalkingMetaSecurityAnswer) {
createSecurityAnswer(datacache.users.john.id, memory.geoStalkingMetaSecurityQuestion, memory.geoStalkingMetaSecurityAnswer)
await createSecurityAnswer(datacache.users.john.id, memory.geoStalkingMetaSecurityQuestion, memory.geoStalkingMetaSecurityAnswer)
memory.user = 'john'
}
if (memory.geoStalkingVisualSecurityQuestion && memory.geoStalkingVisualSecurityAnswer) {
createSecurityAnswer(datacache.users.emma.id, memory.geoStalkingVisualSecurityQuestion, memory.geoStalkingVisualSecurityAnswer)
await createSecurityAnswer(datacache.users.emma.id, memory.geoStalkingVisualSecurityQuestion, memory.geoStalkingVisualSecurityAnswer)
memory.user = 'emma'
}
return MemoryModel.create({
return await MemoryModel.create({
imagePath: 'assets/public/images/uploads/' + tmpImageFileName,
caption: memory.caption,
UserId: datacache.users[memory.user].id
Expand Down Expand Up @@ -325,19 +324,19 @@ async function createProducts () {

return await Promise.all(
products.map(
({ reviews = [], useForChristmasSpecialChallenge = false, urlForProductTamperingChallenge = false, fileForRetrieveBlueprintChallenge = false, ...product }) =>
ProductModel.create({
name:product.name,
description:product.description,
price:product.price,
deluxePrice:product.deluxePrice ,
image:product.image,
async ({ reviews = [], useForChristmasSpecialChallenge = false, urlForProductTamperingChallenge = false, fileForRetrieveBlueprintChallenge = false, ...product }) =>
await ProductModel.create({
name: product.name,
description: product.description,
price: product.price,
deluxePrice: product.deluxePrice,
image: product.image
}).catch(
(err: unknown) => {
logger.error(`Could not insert Product ${product.name}: ${utils.getErrorMessage(err)}`)
}
).then((persistedProduct: ProductModel | void) => {
if(persistedProduct){
).then((persistedProduct) => {
if (persistedProduct) {
if (useForChristmasSpecialChallenge) { datacache.products.christmasSpecial = persistedProduct }
if (urlForProductTamperingChallenge) {
datacache.products.osaft = persistedProduct
Expand All @@ -354,12 +353,12 @@ async function createProducts () {
datacache.challenges.retrieveBlueprintChallenge.hint,
persistedProduct)
})
}
}
}
if(!persistedProduct){
throw new Error("No persisted product found!");
if (!persistedProduct) {
throw new Error('No persisted product found!')
}
return persistedProduct;
return persistedProduct
})
.then(async ({ id }: { id: number }) =>
await Promise.all(
Expand Down Expand Up @@ -400,9 +399,9 @@ async function createBaskets () {
]

return await Promise.all(
baskets.map(basket => {
return BasketModel.create({
UserId:basket.UserId
baskets.map(async basket => {
return await BasketModel.create({
UserId: basket.UserId
}).catch((err: unknown) => {
logger.error(`Could not insert Basket for UserId ${basket.UserId}: ${utils.getErrorMessage(err)}`)
})
Expand Down Expand Up @@ -455,8 +454,8 @@ async function createBasketItems () {
]

return await Promise.all(
basketItems.map(basketItem => {
return BasketItemModel.create(basketItem).catch((err: unknown) => {
basketItems.map(async basketItem => {
return await BasketItemModel.create(basketItem).catch((err: unknown) => {
logger.error(`Could not insert BasketItem for BasketId ${basketItem.BasketId}: ${utils.getErrorMessage(err)}`)
})
})
Expand Down Expand Up @@ -484,19 +483,19 @@ async function createAnonymousFeedback () {
]

return await Promise.all(
feedbacks.map((feedback) => createFeedback(null, feedback.comment, feedback.rating))
feedbacks.map(async (feedback) => await createFeedback(null, feedback.comment, feedback.rating))
)
}

function createFeedback (UserId: number | null, comment: string, rating: number, author?: string) {
async function createFeedback (UserId: number | null, comment: string, rating: number, author?: string) {
const authoredComment = author ? `${comment} (***${author.slice(3)})` : `${comment} (anonymous)`
return FeedbackModel.create({ UserId, comment: authoredComment, rating }).catch((err: unknown) => {
return await FeedbackModel.create({ UserId, comment: authoredComment, rating }).catch((err: unknown) => {
logger.error(`Could not insert Feedback ${authoredComment} mapped to UserId ${UserId}: ${utils.getErrorMessage(err)}`)
})
}

function createComplaints () {
return ComplaintModel.create({
async function createComplaints () {
return await ComplaintModel.create({
UserId: 3,
message: 'I\'ll build my own eCommerce business! With Black Jack! And Hookers!'
}).catch((err: unknown) => {
Expand Down Expand Up @@ -571,17 +570,17 @@ async function createRecycleItem () {
}
]
return await Promise.all(
recycles.map((recycle) => createRecycle(recycle))
recycles.map(async (recycle) => await createRecycle(recycle))
)
}

function createRecycle (data: { UserId: number; quantity: number; AddressId: number; date: string; isPickup: boolean }) {
return RecycleModel.create({
UserId:data.UserId,
async function createRecycle (data: { UserId: number, quantity: number, AddressId: number, date: string, isPickup: boolean }) {
return await RecycleModel.create({
UserId: data.UserId,
AddressId: data.AddressId,
quantity: data.quantity,
isPickup: data.isPickup,
date: data.date,
date: data.date
}).catch((err: unknown) => {
logger.error(`Could not insert Recycling Model: ${utils.getErrorMessage(err)}`)
})
Expand All @@ -601,8 +600,8 @@ async function createSecurityQuestions () {
)
}

function createSecurityAnswer (UserId: number, SecurityQuestionId: number, answer: string) {
return SecurityAnswerModel.create({ SecurityQuestionId, UserId, answer }).catch((err: unknown) => {
async function createSecurityAnswer (UserId: number, SecurityQuestionId: number, answer: string) {
return await SecurityAnswerModel.create({ SecurityQuestionId, UserId, answer }).catch((err: unknown) => {
logger.error(`Could not insert SecurityAnswer ${answer} mapped to UserId ${UserId}: ${utils.getErrorMessage(err)}`)
})
}
Expand Down
61 changes: 30 additions & 31 deletions models/address.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,24 @@ import {
InferAttributes,
InferCreationAttributes,
Model,
DataTypes,
NonAttribute,
} from "sequelize";
import { sequelize } from "./index";
import UserModel from "./user";
DataTypes
} from 'sequelize'
import { sequelize } from './index'
import UserModel from './user'
/* jslint node: true */
class AddressModel extends Model<
InferAttributes<AddressModel>,
InferCreationAttributes<AddressModel>
InferAttributes<AddressModel>,
InferCreationAttributes<AddressModel>
> {
declare UserId: number;
declare id: CreationOptional<number>;
declare fullName: string;
declare mobileNum: number;
declare zipCode: string;
declare streetAddress: string;
declare city: string;
declare state: string | null;
declare country: string;
declare UserId: number
declare id: CreationOptional<number>
declare fullName: string
declare mobileNum: number
declare zipCode: string
declare streetAddress: string
declare city: string
declare state: string | null
declare country: string
}

AddressModel.init(
Expand All @@ -35,44 +34,44 @@ AddressModel.init(
id: {
type: DataTypes.INTEGER,
primaryKey: true,
autoIncrement: true,
autoIncrement: true
},
fullName: {
type: DataTypes.STRING,
type: DataTypes.STRING
},
mobileNum: {
type: DataTypes.INTEGER,
validate: {
isInt: true,
min: 1000000,
max: 9999999999,
},
max: 9999999999
}
},
zipCode: {
type: DataTypes.STRING,
validate: {
len: [1, 8],
},
len: [1, 8]
}
},
streetAddress: {
type: DataTypes.STRING,
validate: {
len: [1, 160],
},
len: [1, 160]
}
},
city: DataTypes.STRING,
state: DataTypes.STRING,
country: DataTypes.STRING,
country: DataTypes.STRING
},
{
tableName: "Address",
sequelize,
tableName: 'Address',
sequelize
}
);
)

AddressModel.belongsTo(UserModel, {
constraints: true,
foreignKeyConstraint: true,
});
foreignKeyConstraint: true
})

export default AddressModel;
export default AddressModel
Loading

0 comments on commit ab96f8d

Please sign in to comment.