From 69023786ed9d32f40d63c7024919e00e332f6d8e Mon Sep 17 00:00:00 2001 From: Vaibhav Singh Date: Mon, 23 Dec 2019 00:28:17 +0530 Subject: [PATCH 1/3] Added seeders for models --- server/factories/event_sponsor.factory.ts | 20 +++++++++++ server/factories/rsvp.factory.ts | 22 ++++++++++++ server/factories/social_provider.factory.ts | 12 +++++++ .../factories/social_provider_user.factory.ts | 20 +++++++++++ server/factories/sponsor.factory.ts | 34 +++++++++++++++++++ server/factories/tag.factory.ts | 18 ++++++++++ server/factories/user.factory.ts | 4 +-- server/factories/user_ban.factory.ts | 20 +++++++++++ server/factories/user_chapter.factory.ts | 20 +++++++++++ server/seeds/10_social_provider.seed.ts | 9 +++++ server/seeds/11_social_provider_users.seed.ts | 14 ++++++++ server/seeds/12_rsvp.seed.ts | 14 ++++++++ server/seeds/13_event_sponsor.seed.ts | 14 ++++++++ server/seeds/6_sponsor.seed.ts | 8 +++++ server/seeds/7_tag.seed.ts | 12 +++++++ server/seeds/8_user_ban.seed.ts | 14 ++++++++ server/seeds/9_user_chapter.seed.ts | 14 ++++++++ 17 files changed, 267 insertions(+), 2 deletions(-) create mode 100644 server/factories/event_sponsor.factory.ts create mode 100644 server/factories/rsvp.factory.ts create mode 100644 server/factories/social_provider.factory.ts create mode 100644 server/factories/social_provider_user.factory.ts create mode 100644 server/factories/sponsor.factory.ts create mode 100644 server/factories/tag.factory.ts create mode 100644 server/factories/user_ban.factory.ts create mode 100644 server/factories/user_chapter.factory.ts create mode 100644 server/seeds/10_social_provider.seed.ts create mode 100644 server/seeds/11_social_provider_users.seed.ts create mode 100644 server/seeds/12_rsvp.seed.ts create mode 100644 server/seeds/13_event_sponsor.seed.ts create mode 100644 server/seeds/6_sponsor.seed.ts create mode 100644 server/seeds/7_tag.seed.ts create mode 100644 server/seeds/8_user_ban.seed.ts create mode 100644 server/seeds/9_user_chapter.seed.ts diff --git a/server/factories/event_sponsor.factory.ts b/server/factories/event_sponsor.factory.ts new file mode 100644 index 0000000000..b30f471ca9 --- /dev/null +++ b/server/factories/event_sponsor.factory.ts @@ -0,0 +1,20 @@ +import Faker from 'faker'; +import { define } from 'typeorm-seeding'; + +import { EventSponsor } from '../models/EventSponsor'; +import { Event } from '../models/Event'; +import { Sponsor } from '../models/Sponsor'; + +define(EventSponsor, ( + _faker: typeof Faker, + params: { event: Event; sponsor: Sponsor }, +) => { + const { event, sponsor } = params; + + const rsvp = new EventSponsor({ + sponsor, + event, + }); + + return rsvp; +}); diff --git a/server/factories/rsvp.factory.ts b/server/factories/rsvp.factory.ts new file mode 100644 index 0000000000..b65be74046 --- /dev/null +++ b/server/factories/rsvp.factory.ts @@ -0,0 +1,22 @@ +import Faker from 'faker'; +import { define } from 'typeorm-seeding'; + +import { Rsvp } from '../models/Rsvp'; +import { Event } from '../models/Event'; +import { User } from '../models/User'; + +define(Rsvp, (faker: typeof Faker, params: { user: User; event: Event }) => { + const { user, event } = params; + + const date = faker.date.future(); + const on_waitlist = faker.random.boolean(); + + const rsvp = new Rsvp({ + date, + on_waitlist, + user, + event, + }); + + return rsvp; +}); diff --git a/server/factories/social_provider.factory.ts b/server/factories/social_provider.factory.ts new file mode 100644 index 0000000000..c41dc8f1a7 --- /dev/null +++ b/server/factories/social_provider.factory.ts @@ -0,0 +1,12 @@ +import Faker from 'faker'; +import { define } from 'typeorm-seeding'; + +import { SocialProvider } from '../models/SocialProvider'; + +define(SocialProvider, (_faker: typeof Faker) => { + const user_ban = new SocialProvider({ + name: 'gauth', + }); + + return user_ban; +}); diff --git a/server/factories/social_provider_user.factory.ts b/server/factories/social_provider_user.factory.ts new file mode 100644 index 0000000000..26b576e86b --- /dev/null +++ b/server/factories/social_provider_user.factory.ts @@ -0,0 +1,20 @@ +import Faker from 'faker'; +import { define } from 'typeorm-seeding'; + +import { SocialProviderUser } from '../models/SocialProviderUser'; +import { SocialProvider } from '../models/SocialProvider'; +import { User } from '../models/User'; + +define(SocialProviderUser, ( + _faker: typeof Faker, + params: { user: User; socialProvider: SocialProvider }, +) => { + const { user, socialProvider } = params; + + const user_ban = new SocialProviderUser({ + user, + socialProvider, + }); + + return user_ban; +}); diff --git a/server/factories/sponsor.factory.ts b/server/factories/sponsor.factory.ts new file mode 100644 index 0000000000..639091abc5 --- /dev/null +++ b/server/factories/sponsor.factory.ts @@ -0,0 +1,34 @@ +import Faker from 'faker'; +import { define } from 'typeorm-seeding'; + +import { Sponsor } from '../models/Sponsor'; + +function randomEnum(anEnum: T): T[keyof T] { + const enumValues = (Object.keys(anEnum) + .map(n => Number.parseInt(n)) + .filter(n => !Number.isNaN(n)) as unknown) as T[keyof T][]; + const randomIndex = Math.floor(Math.random() * enumValues.length); + const randomEnumValue = anEnum[randomIndex]; + return randomEnumValue; +} + +define(Sponsor, (faker: typeof Faker) => { + const name = faker.company.companyName(); + const website = faker.internet.url(); + const logoPath = faker.system.commonFileName('png'); + enum SponsorType { + 'FOOD', + 'VENUE', + 'OTHER', + } + const type = String(randomEnum(SponsorType)); + + const sponsor = new Sponsor({ + name, + website, + logoPath, + type, + }); + + return sponsor; +}); diff --git a/server/factories/tag.factory.ts b/server/factories/tag.factory.ts new file mode 100644 index 0000000000..e3a8e8f48a --- /dev/null +++ b/server/factories/tag.factory.ts @@ -0,0 +1,18 @@ +import Faker from 'faker'; +import { define } from 'typeorm-seeding'; + +import { Tag } from '../models/Tag'; +import { Event } from '../models/Event'; + +define(Tag, (faker: typeof Faker, params: { event: Event }) => { + const { event } = params; + + const name = faker.company.companyName(); + + const tag = new Tag({ + name, + event, + }); + + return tag; +}); diff --git a/server/factories/user.factory.ts b/server/factories/user.factory.ts index 922068abae..f16ccbf960 100644 --- a/server/factories/user.factory.ts +++ b/server/factories/user.factory.ts @@ -3,11 +3,11 @@ import { define } from 'typeorm-seeding'; import { User } from '../models/User'; define(User, (faker: typeof Faker) => { - const location = new User({ + const user = new User({ email: faker.internet.email(), first_name: faker.name.firstName(), last_name: faker.name.lastName(), }); - return location; + return user; }); diff --git a/server/factories/user_ban.factory.ts b/server/factories/user_ban.factory.ts new file mode 100644 index 0000000000..bab8c0b304 --- /dev/null +++ b/server/factories/user_ban.factory.ts @@ -0,0 +1,20 @@ +import Faker from 'faker'; +import { define } from 'typeorm-seeding'; + +import { UserBan } from '../models/UserBan'; +import { Chapter } from '../models/Chapter'; +import { User } from '../models/User'; + +define(UserBan, ( + _faker: typeof Faker, + params: { user: User; chapter: Chapter }, +) => { + const { user, chapter } = params; + + const user_ban = new UserBan({ + user, + chapter, + }); + + return user_ban; +}); diff --git a/server/factories/user_chapter.factory.ts b/server/factories/user_chapter.factory.ts new file mode 100644 index 0000000000..7fcd5347c8 --- /dev/null +++ b/server/factories/user_chapter.factory.ts @@ -0,0 +1,20 @@ +import Faker from 'faker'; +import { define } from 'typeorm-seeding'; + +import { UserChapter } from '../models/UserChapter'; +import { Chapter } from '../models/Chapter'; +import { User } from '../models/User'; + +define(UserChapter, ( + _faker: typeof Faker, + params: { user: User; chapter: Chapter }, +) => { + const { user, chapter } = params; + + const user_chapter = new UserChapter({ + user, + chapter, + }); + + return user_chapter; +}); diff --git a/server/seeds/10_social_provider.seed.ts b/server/seeds/10_social_provider.seed.ts new file mode 100644 index 0000000000..f420480cad --- /dev/null +++ b/server/seeds/10_social_provider.seed.ts @@ -0,0 +1,9 @@ +import { Factory, Seeder } from 'typeorm-seeding'; + +import { SocialProvider } from '../models/SocialProvider'; + +export default class CreateSocialProvider implements Seeder { + public async run(factory: Factory): Promise { + await factory(SocialProvider)().seedMany(5); + } +} diff --git a/server/seeds/11_social_provider_users.seed.ts b/server/seeds/11_social_provider_users.seed.ts new file mode 100644 index 0000000000..8749763541 --- /dev/null +++ b/server/seeds/11_social_provider_users.seed.ts @@ -0,0 +1,14 @@ +import { Factory, Seeder } from 'typeorm-seeding'; + +import { SocialProvider } from '../models/SocialProvider'; +import { User } from '../models/User'; +import { SocialProviderUser } from '../models/SocialProviderUser'; + +export default class CreateUserBans implements Seeder { + public async run(factory: Factory): Promise { + const user = await User.findOne(); + const socialProvider = await SocialProvider.findOne(); + + await factory(SocialProviderUser)({ user, socialProvider }).seedMany(5); + } +} diff --git a/server/seeds/12_rsvp.seed.ts b/server/seeds/12_rsvp.seed.ts new file mode 100644 index 0000000000..082c414d87 --- /dev/null +++ b/server/seeds/12_rsvp.seed.ts @@ -0,0 +1,14 @@ +import { Factory, Seeder } from 'typeorm-seeding'; + +import { Event } from '../models/Event'; +import { User } from '../models/User'; +import { Rsvp } from '../models/Rsvp'; + +export default class CreateRsvp implements Seeder { + public async run(factory: Factory): Promise { + const user = await User.findOne(); + const event = await Event.findOne(); + + await factory(Rsvp)({ user, event }).seedMany(5); + } +} diff --git a/server/seeds/13_event_sponsor.seed.ts b/server/seeds/13_event_sponsor.seed.ts new file mode 100644 index 0000000000..d487c5c9d6 --- /dev/null +++ b/server/seeds/13_event_sponsor.seed.ts @@ -0,0 +1,14 @@ +import { Factory, Seeder } from 'typeorm-seeding'; + +import { EventSponsor } from '../models/EventSponsor'; +import { Event } from '../models/Event'; +import { Sponsor } from '../models/Sponsor'; + +export default class CreateEventSponsor implements Seeder { + public async run(factory: Factory): Promise { + const event = await Event.findOne(); + const sponsor = await Sponsor.findOne(); + + await factory(EventSponsor)({ event, sponsor }).seedMany(5); + } +} diff --git a/server/seeds/6_sponsor.seed.ts b/server/seeds/6_sponsor.seed.ts new file mode 100644 index 0000000000..ba1561b270 --- /dev/null +++ b/server/seeds/6_sponsor.seed.ts @@ -0,0 +1,8 @@ +import { Factory, Seeder } from 'typeorm-seeding'; +import { Sponsor } from '../models/Sponsor'; + +export default class CreateSponsors implements Seeder { + public async run(factory: Factory): Promise { + await factory(Sponsor)().seedMany(5); + } +} diff --git a/server/seeds/7_tag.seed.ts b/server/seeds/7_tag.seed.ts new file mode 100644 index 0000000000..35f04ba6d6 --- /dev/null +++ b/server/seeds/7_tag.seed.ts @@ -0,0 +1,12 @@ +import { Factory, Seeder } from 'typeorm-seeding'; + +import { Tag } from '../models/Tag'; +import { Event } from '../models/Event'; + +export default class CreateTags implements Seeder { + public async run(factory: Factory): Promise { + const event = await Event.findOne(); + + await factory(Tag)({ event }).seedMany(5); + } +} diff --git a/server/seeds/8_user_ban.seed.ts b/server/seeds/8_user_ban.seed.ts new file mode 100644 index 0000000000..3b1c3b492c --- /dev/null +++ b/server/seeds/8_user_ban.seed.ts @@ -0,0 +1,14 @@ +import { Factory, Seeder } from 'typeorm-seeding'; + +import { Chapter } from '../models/Chapter'; +import { User } from '../models/User'; +import { UserBan } from '../models/UserBan'; + +export default class CreateUserBans implements Seeder { + public async run(factory: Factory): Promise { + const user = await User.findOne(); + const chapter = await Chapter.findOne(); + + await factory(UserBan)({ user, chapter }).seedMany(5); + } +} diff --git a/server/seeds/9_user_chapter.seed.ts b/server/seeds/9_user_chapter.seed.ts new file mode 100644 index 0000000000..092fb91f06 --- /dev/null +++ b/server/seeds/9_user_chapter.seed.ts @@ -0,0 +1,14 @@ +import { Factory, Seeder } from 'typeorm-seeding'; + +import { Chapter } from '../models/Chapter'; +import { User } from '../models/User'; +import { UserChapter } from '../models/UserChapter'; + +export default class CreateUserChapter implements Seeder { + public async run(factory: Factory): Promise { + const user = await User.findOne(); + const chapter = await Chapter.findOne(); + + await factory(UserChapter)({ user, chapter }).seedMany(5); + } +} From e36086d56d1404c88ee88c556e745ee3f0135fa0 Mon Sep 17 00:00:00 2001 From: Vaibhav Singh Date: Wed, 25 Dec 2019 01:12:51 +0530 Subject: [PATCH 2/3] Fixed: optimized code and fix typeorm seeding behaviour --- server/factories/sponsor.factory.ts | 18 +++--------------- .../seeds/{1_user.seed.ts => 000_user.seed.ts} | 0 ...2_location.seed.ts => 001_location.seed.ts} | 0 .../{3_chapter.seed.ts => 002_chapter.seed.ts} | 0 .../{4_venue.seed.ts => 003_venue.seed.ts} | 0 .../{5_events.seed.ts => 004_events.seed.ts} | 0 .../{6_sponsor.seed.ts => 005_sponsor.seed.ts} | 0 .../seeds/{7_tag.seed.ts => 006_tag.seed.ts} | 0 ...8_user_ban.seed.ts => 007_user_ban.seed.ts} | 0 ...hapter.seed.ts => 008_user_chapter.seed.ts} | 0 ...der.seed.ts => 009_social_provider.seed.ts} | 0 ...ed.ts => 010_social_provider_users.seed.ts} | 7 +++++-- .../{12_rsvp.seed.ts => 011_rsvp.seed.ts} | 0 ...onsor.seed.ts => 012_event_sponsor.seed.ts} | 0 server/util/Utilities.ts | 9 +++++++++ types/SponsorTypes.ts | 5 +++++ 16 files changed, 22 insertions(+), 17 deletions(-) rename server/seeds/{1_user.seed.ts => 000_user.seed.ts} (100%) rename server/seeds/{2_location.seed.ts => 001_location.seed.ts} (100%) rename server/seeds/{3_chapter.seed.ts => 002_chapter.seed.ts} (100%) rename server/seeds/{4_venue.seed.ts => 003_venue.seed.ts} (100%) rename server/seeds/{5_events.seed.ts => 004_events.seed.ts} (100%) rename server/seeds/{6_sponsor.seed.ts => 005_sponsor.seed.ts} (100%) rename server/seeds/{7_tag.seed.ts => 006_tag.seed.ts} (100%) rename server/seeds/{8_user_ban.seed.ts => 007_user_ban.seed.ts} (100%) rename server/seeds/{9_user_chapter.seed.ts => 008_user_chapter.seed.ts} (100%) rename server/seeds/{10_social_provider.seed.ts => 009_social_provider.seed.ts} (100%) rename server/seeds/{11_social_provider_users.seed.ts => 010_social_provider_users.seed.ts} (70%) rename server/seeds/{12_rsvp.seed.ts => 011_rsvp.seed.ts} (100%) rename server/seeds/{13_event_sponsor.seed.ts => 012_event_sponsor.seed.ts} (100%) create mode 100644 types/SponsorTypes.ts diff --git a/server/factories/sponsor.factory.ts b/server/factories/sponsor.factory.ts index 639091abc5..3fa2d52a46 100644 --- a/server/factories/sponsor.factory.ts +++ b/server/factories/sponsor.factory.ts @@ -2,26 +2,14 @@ import Faker from 'faker'; import { define } from 'typeorm-seeding'; import { Sponsor } from '../models/Sponsor'; - -function randomEnum(anEnum: T): T[keyof T] { - const enumValues = (Object.keys(anEnum) - .map(n => Number.parseInt(n)) - .filter(n => !Number.isNaN(n)) as unknown) as T[keyof T][]; - const randomIndex = Math.floor(Math.random() * enumValues.length); - const randomEnumValue = anEnum[randomIndex]; - return randomEnumValue; -} +import { SponsorTypes } from '../../types/SponsorTypes'; +import { randomEnum } from '../util/Utilities'; define(Sponsor, (faker: typeof Faker) => { const name = faker.company.companyName(); const website = faker.internet.url(); const logoPath = faker.system.commonFileName('png'); - enum SponsorType { - 'FOOD', - 'VENUE', - 'OTHER', - } - const type = String(randomEnum(SponsorType)); + const type = String(randomEnum(SponsorTypes)); const sponsor = new Sponsor({ name, diff --git a/server/seeds/1_user.seed.ts b/server/seeds/000_user.seed.ts similarity index 100% rename from server/seeds/1_user.seed.ts rename to server/seeds/000_user.seed.ts diff --git a/server/seeds/2_location.seed.ts b/server/seeds/001_location.seed.ts similarity index 100% rename from server/seeds/2_location.seed.ts rename to server/seeds/001_location.seed.ts diff --git a/server/seeds/3_chapter.seed.ts b/server/seeds/002_chapter.seed.ts similarity index 100% rename from server/seeds/3_chapter.seed.ts rename to server/seeds/002_chapter.seed.ts diff --git a/server/seeds/4_venue.seed.ts b/server/seeds/003_venue.seed.ts similarity index 100% rename from server/seeds/4_venue.seed.ts rename to server/seeds/003_venue.seed.ts diff --git a/server/seeds/5_events.seed.ts b/server/seeds/004_events.seed.ts similarity index 100% rename from server/seeds/5_events.seed.ts rename to server/seeds/004_events.seed.ts diff --git a/server/seeds/6_sponsor.seed.ts b/server/seeds/005_sponsor.seed.ts similarity index 100% rename from server/seeds/6_sponsor.seed.ts rename to server/seeds/005_sponsor.seed.ts diff --git a/server/seeds/7_tag.seed.ts b/server/seeds/006_tag.seed.ts similarity index 100% rename from server/seeds/7_tag.seed.ts rename to server/seeds/006_tag.seed.ts diff --git a/server/seeds/8_user_ban.seed.ts b/server/seeds/007_user_ban.seed.ts similarity index 100% rename from server/seeds/8_user_ban.seed.ts rename to server/seeds/007_user_ban.seed.ts diff --git a/server/seeds/9_user_chapter.seed.ts b/server/seeds/008_user_chapter.seed.ts similarity index 100% rename from server/seeds/9_user_chapter.seed.ts rename to server/seeds/008_user_chapter.seed.ts diff --git a/server/seeds/10_social_provider.seed.ts b/server/seeds/009_social_provider.seed.ts similarity index 100% rename from server/seeds/10_social_provider.seed.ts rename to server/seeds/009_social_provider.seed.ts diff --git a/server/seeds/11_social_provider_users.seed.ts b/server/seeds/010_social_provider_users.seed.ts similarity index 70% rename from server/seeds/11_social_provider_users.seed.ts rename to server/seeds/010_social_provider_users.seed.ts index 8749763541..0a0307bb4f 100644 --- a/server/seeds/11_social_provider_users.seed.ts +++ b/server/seeds/010_social_provider_users.seed.ts @@ -4,11 +4,14 @@ import { SocialProvider } from '../models/SocialProvider'; import { User } from '../models/User'; import { SocialProviderUser } from '../models/SocialProviderUser'; -export default class CreateUserBans implements Seeder { +export default class CreateSocialProviderUser implements Seeder { public async run(factory: Factory): Promise { const user = await User.findOne(); const socialProvider = await SocialProvider.findOne(); - await factory(SocialProviderUser)({ user, socialProvider }).seedMany(5); + await factory(SocialProviderUser)({ + user, + socialProvider, + }).seedMany(5); } } diff --git a/server/seeds/12_rsvp.seed.ts b/server/seeds/011_rsvp.seed.ts similarity index 100% rename from server/seeds/12_rsvp.seed.ts rename to server/seeds/011_rsvp.seed.ts diff --git a/server/seeds/13_event_sponsor.seed.ts b/server/seeds/012_event_sponsor.seed.ts similarity index 100% rename from server/seeds/13_event_sponsor.seed.ts rename to server/seeds/012_event_sponsor.seed.ts diff --git a/server/util/Utilities.ts b/server/util/Utilities.ts index 95b9d3b9cd..8182fae7ba 100644 --- a/server/util/Utilities.ts +++ b/server/util/Utilities.ts @@ -3,3 +3,12 @@ export default class Utilities { return !values.filter((val: any) => !val && val !== 0).length; } } + +export const randomEnum = (anEnum: T): T[keyof T] => { + const enumValues = (Object.keys(anEnum) + .map(n => Number.parseInt(n)) + .filter(n => !Number.isNaN(n)) as unknown) as T[keyof T][]; + const randomIndex = Math.floor(Math.random() * enumValues.length); + const randomEnumValue = anEnum[randomIndex]; + return randomEnumValue; +}; diff --git a/types/SponsorTypes.ts b/types/SponsorTypes.ts new file mode 100644 index 0000000000..d190e851fb --- /dev/null +++ b/types/SponsorTypes.ts @@ -0,0 +1,5 @@ +export enum SponsorTypes { + 'FOOD', + 'VENUE', + 'OTHER', +} From bb634b98d2b044397f0e44ce8f8a18b8002a86ee Mon Sep 17 00:00:00 2001 From: Vaibhav Singh Date: Wed, 25 Dec 2019 02:37:27 +0530 Subject: [PATCH 3/3] Fix: variable names --- server/factories/event_sponsor.factory.ts | 4 ++-- server/factories/social_provider.factory.ts | 4 ++-- server/factories/social_provider_user.factory.ts | 4 ++-- server/factories/user_ban.factory.ts | 4 ++-- server/factories/user_chapter.factory.ts | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/server/factories/event_sponsor.factory.ts b/server/factories/event_sponsor.factory.ts index b30f471ca9..b0a6b286a9 100644 --- a/server/factories/event_sponsor.factory.ts +++ b/server/factories/event_sponsor.factory.ts @@ -11,10 +11,10 @@ define(EventSponsor, ( ) => { const { event, sponsor } = params; - const rsvp = new EventSponsor({ + const eventSponsor = new EventSponsor({ sponsor, event, }); - return rsvp; + return eventSponsor; }); diff --git a/server/factories/social_provider.factory.ts b/server/factories/social_provider.factory.ts index c41dc8f1a7..32581fed56 100644 --- a/server/factories/social_provider.factory.ts +++ b/server/factories/social_provider.factory.ts @@ -4,9 +4,9 @@ import { define } from 'typeorm-seeding'; import { SocialProvider } from '../models/SocialProvider'; define(SocialProvider, (_faker: typeof Faker) => { - const user_ban = new SocialProvider({ + const socialProvider = new SocialProvider({ name: 'gauth', }); - return user_ban; + return socialProvider; }); diff --git a/server/factories/social_provider_user.factory.ts b/server/factories/social_provider_user.factory.ts index 26b576e86b..77c4a1081a 100644 --- a/server/factories/social_provider_user.factory.ts +++ b/server/factories/social_provider_user.factory.ts @@ -11,10 +11,10 @@ define(SocialProviderUser, ( ) => { const { user, socialProvider } = params; - const user_ban = new SocialProviderUser({ + const socialProviderUser = new SocialProviderUser({ user, socialProvider, }); - return user_ban; + return socialProviderUser; }); diff --git a/server/factories/user_ban.factory.ts b/server/factories/user_ban.factory.ts index bab8c0b304..f5aa3f29eb 100644 --- a/server/factories/user_ban.factory.ts +++ b/server/factories/user_ban.factory.ts @@ -11,10 +11,10 @@ define(UserBan, ( ) => { const { user, chapter } = params; - const user_ban = new UserBan({ + const userBan = new UserBan({ user, chapter, }); - return user_ban; + return userBan; }); diff --git a/server/factories/user_chapter.factory.ts b/server/factories/user_chapter.factory.ts index 7fcd5347c8..76ab11fa76 100644 --- a/server/factories/user_chapter.factory.ts +++ b/server/factories/user_chapter.factory.ts @@ -11,10 +11,10 @@ define(UserChapter, ( ) => { const { user, chapter } = params; - const user_chapter = new UserChapter({ + const userChapter = new UserChapter({ user, chapter, }); - return user_chapter; + return userChapter; });