Merge pull request #121 from hack-the-6ix/develop

Discord Helm configuration and bugfixes (#120)
hack-the-6ix · Jul 29, 2023 · 5cee76d · 5cee76d
2 parents 7e5d77a + b5d39b6
commit 5cee76d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/chart/templates/secrets.yaml b/chart/templates/secrets.yaml
@@ -8,4 +8,7 @@ data:
  DATABASE: {{ .Values.hackthe6ixBackend.secrets.local.mongoUrl | b64enc }}
  MAILTRAIN_API_KEY: {{ .Values.hackthe6ixBackend.secrets.local.mailerApiKey | b64enc }}
  JWT_SECRET: {{ .Values.hackthe6ixBackend.secrets.local.jwtSecret | b64enc }}
+ DISCORD_CLIENT_ID: {{ .Values.hackthe6ixBackend.secrets.local.discordClientId | b64enc }}
+ DISCORD_CLIENT_SECRET: {{ .Values.hackthe6ixBackend.secrets.local.discordClientSecret | b64enc }}
+ DISCORD_GUILD_ID: {{ .Values.hackthe6ixBackend.secrets.discord.discordGuildId | b64enc }}
  {{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -95,6 +95,9 @@ hackthe6ixBackend:
  mongoUrl: mongodb://localhost:27017/test
  mailerApiKey: changeme
  jwtSecret: changeme
+ discordClientId: changeme
+ discordClientSecret: changeme
+ discordGuildId: changeme
  initialization:
  secretName: test-secret
  settings:

diff --git a/src/controller/DiscordController.ts b/src/controller/DiscordController.ts
@@ -95,6 +95,7 @@ export const queueVerification = async (discordID: string, userData: BasicUser,
  queuedTime: Date.now(),
  discordID,
  guildID: process.env.DISCORD_GUILD_ID,
+ earliestProcessTime: 0,
  revert: false,
  verifyData: _assembleReturnInfo(userData)
  });

diff --git a/src/models/queuedverification/fields.ts b/src/models/queuedverification/fields.ts
@@ -27,7 +27,8 @@ export const fields = {
  type: Number
  },
  earliestProcessTime: {
- type: Number
+ type: Number,
+ required: true
  },
  guildID: {
  type: String,