From a7b23da127cc2f2413bd23390b32a0594618e853 Mon Sep 17 00:00:00 2001 From: Matthew R Date: Mon, 28 Feb 2022 12:00:48 -0500 Subject: [PATCH] resolve threads in prev. merge req. --- {models => mongodb-models}/Customer.ts | 0 {models => mongodb-models}/CustomerPortal.ts | 2 +- {models => mongodb-models}/ExecutiveOrder.ts | 0 {models => mongodb-models}/File.ts | 0 {models => mongodb-models}/Inquiry.ts | 0 {models => mongodb-models}/Judgement.ts | 0 {models => mongodb-models}/Member.ts | 0 {models => mongodb-models}/Merchant.ts | 2 +- {models => mongodb-models}/Moderation.ts | 0 {models => mongodb-models}/Motion.ts | 0 {models => mongodb-models}/Note.ts | 2 +- {models => mongodb-models}/PagerNumber.ts | 4 ++-- {models => mongodb-models}/Proclamation.ts | 0 {models => mongodb-models}/Promo.ts | 0 {models => mongodb-models}/Rank.ts | 2 +- {models => mongodb-models}/Redirect.ts | 0 {models => mongodb-models}/Resolution.ts | 0 {models => mongodb-models}/SAA.ts | 0 {models => mongodb-models}/Score.ts | 0 {models => mongodb-models}/ScoreHistorical.ts | 0 {models => mongodb-models}/Staff.ts | 0 {models => mongodb-models}/Stat.ts | 0 22 files changed, 6 insertions(+), 6 deletions(-) rename {models => mongodb-models}/Customer.ts (100%) rename {models => mongodb-models}/CustomerPortal.ts (93%) rename {models => mongodb-models}/ExecutiveOrder.ts (100%) rename {models => mongodb-models}/File.ts (100%) rename {models => mongodb-models}/Inquiry.ts (100%) rename {models => mongodb-models}/Judgement.ts (100%) rename {models => mongodb-models}/Member.ts (100%) rename {models => mongodb-models}/Merchant.ts (93%) rename {models => mongodb-models}/Moderation.ts (100%) rename {models => mongodb-models}/Motion.ts (100%) rename {models => mongodb-models}/Note.ts (92%) rename {models => mongodb-models}/PagerNumber.ts (87%) rename {models => mongodb-models}/Proclamation.ts (100%) rename {models => mongodb-models}/Promo.ts (100%) rename {models => mongodb-models}/Rank.ts (90%) rename {models => mongodb-models}/Redirect.ts (100%) rename {models => mongodb-models}/Resolution.ts (100%) rename {models => mongodb-models}/SAA.ts (100%) rename {models => mongodb-models}/Score.ts (100%) rename {models => mongodb-models}/ScoreHistorical.ts (100%) rename {models => mongodb-models}/Staff.ts (100%) rename {models => mongodb-models}/Stat.ts (100%) diff --git a/models/Customer.ts b/mongodb-models/Customer.ts similarity index 100% rename from models/Customer.ts rename to mongodb-models/Customer.ts diff --git a/models/CustomerPortal.ts b/mongodb-models/CustomerPortal.ts similarity index 93% rename from models/CustomerPortal.ts rename to mongodb-models/CustomerPortal.ts index 484c1dd..309597f 100644 --- a/models/CustomerPortal.ts +++ b/mongodb-models/CustomerPortal.ts @@ -16,6 +16,6 @@ export default class CustomerPortal { @prop({ required: true }) public expiresOn: Date; - @prop({ required: true }) + @prop() public used: boolean; } diff --git a/models/ExecutiveOrder.ts b/mongodb-models/ExecutiveOrder.ts similarity index 100% rename from models/ExecutiveOrder.ts rename to mongodb-models/ExecutiveOrder.ts diff --git a/models/File.ts b/mongodb-models/File.ts similarity index 100% rename from models/File.ts rename to mongodb-models/File.ts diff --git a/models/Inquiry.ts b/mongodb-models/Inquiry.ts similarity index 100% rename from models/Inquiry.ts rename to mongodb-models/Inquiry.ts diff --git a/models/Judgement.ts b/mongodb-models/Judgement.ts similarity index 100% rename from models/Judgement.ts rename to mongodb-models/Judgement.ts diff --git a/models/Member.ts b/mongodb-models/Member.ts similarity index 100% rename from models/Member.ts rename to mongodb-models/Member.ts diff --git a/models/Merchant.ts b/mongodb-models/Merchant.ts similarity index 93% rename from models/Merchant.ts rename to mongodb-models/Merchant.ts index e07c7f6..252cd2e 100644 --- a/models/Merchant.ts +++ b/mongodb-models/Merchant.ts @@ -14,6 +14,6 @@ export default class Merchant { @prop({ required: true }) public type: InqType; - @prop({ required: true }) + @prop({ default: [] }) public pulls: [{ type: InqType, reason: string, date: Date }]; } diff --git a/models/Moderation.ts b/mongodb-models/Moderation.ts similarity index 100% rename from models/Moderation.ts rename to mongodb-models/Moderation.ts diff --git a/models/Motion.ts b/mongodb-models/Motion.ts similarity index 100% rename from models/Motion.ts rename to mongodb-models/Motion.ts diff --git a/models/Note.ts b/mongodb-models/Note.ts similarity index 92% rename from models/Note.ts rename to mongodb-models/Note.ts index 9735aa3..0e6ee53 100644 --- a/models/Note.ts +++ b/mongodb-models/Note.ts @@ -12,7 +12,7 @@ export default class Note { @prop({ required: true }) date: Date; - @prop({ required: true }) + @prop({ default: '' }) category: NoteType; @prop({ required: true }) diff --git a/models/PagerNumber.ts b/mongodb-models/PagerNumber.ts similarity index 87% rename from models/PagerNumber.ts rename to mongodb-models/PagerNumber.ts index 63d860c..2d1b711 100644 --- a/models/PagerNumber.ts +++ b/mongodb-models/PagerNumber.ts @@ -13,10 +13,10 @@ export default class PagerNumberRaw { @prop({ required: true }) public discordIDs: string[]; - @prop({ required: true }) + @prop() public receiveEmail: boolean; - @prop({ required: true }) + @prop() public receivePhone: boolean; } diff --git a/models/Proclamation.ts b/mongodb-models/Proclamation.ts similarity index 100% rename from models/Proclamation.ts rename to mongodb-models/Proclamation.ts diff --git a/models/Promo.ts b/mongodb-models/Promo.ts similarity index 100% rename from models/Promo.ts rename to mongodb-models/Promo.ts diff --git a/models/Rank.ts b/mongodb-models/Rank.ts similarity index 90% rename from models/Rank.ts rename to mongodb-models/Rank.ts index 783e8bb..880d347 100644 --- a/models/Rank.ts +++ b/mongodb-models/Rank.ts @@ -10,6 +10,6 @@ export default class Rank { @prop({ required: true }) public permissions: string[]; - @prop({ required: true }) + @prop() public description: string; } diff --git a/models/Redirect.ts b/mongodb-models/Redirect.ts similarity index 100% rename from models/Redirect.ts rename to mongodb-models/Redirect.ts diff --git a/models/Resolution.ts b/mongodb-models/Resolution.ts similarity index 100% rename from models/Resolution.ts rename to mongodb-models/Resolution.ts diff --git a/models/SAA.ts b/mongodb-models/SAA.ts similarity index 100% rename from models/SAA.ts rename to mongodb-models/SAA.ts diff --git a/models/Score.ts b/mongodb-models/Score.ts similarity index 100% rename from models/Score.ts rename to mongodb-models/Score.ts diff --git a/models/ScoreHistorical.ts b/mongodb-models/ScoreHistorical.ts similarity index 100% rename from models/ScoreHistorical.ts rename to mongodb-models/ScoreHistorical.ts diff --git a/models/Staff.ts b/mongodb-models/Staff.ts similarity index 100% rename from models/Staff.ts rename to mongodb-models/Staff.ts diff --git a/models/Stat.ts b/mongodb-models/Stat.ts similarity index 100% rename from models/Stat.ts rename to mongodb-models/Stat.ts