index.ts

@@ -2,13 +2,12 @@ import { config } from "./server/configuration"
 import Server from "./server/server"
 import { ExtendedClient } from "./server/structures/client"
 
-//const server = Server.init(config.port)
+const server = Server.init(config.port)
 export const client = new ExtendedClient()
 
-client.start()
 
-//server.start(() => {
+server.start(() => {
-//	console.log(`Server running on port ${server.getPort()}`)
+	console.log(`Server running on port ${server.getPort()}`)
-//	//const discordAdapter = new DiscordAdapter()
+	//const discordAdapter = new DiscordAdapter()
-//	client.start()
+	client.start()
-//})
+})

server/handler/repeatingEvents/helper.ts

@@ -1,6 +1,7 @@
 import { format } from "date-fns"
-import { Guild, GuildScheduledEvent, GuildScheduledEventCreateOptions } from "discord.js"
+import add from "date-fns/add"
-import { sendFailureDM } from "../../helper/sendFailureDM"
+import { DateResolvable, Guild, GuildScheduledEvent, GuildScheduledEventCreateOptions } from "discord.js"
+import { client } from "../../.."
 import { CustomError, errorCodes, Maybe } from "../../interfaces"
 import { RepetitonInfo, Schedule, supportedSchedule } from "../../types/scheduledEventTypes"
 
@@ -48,8 +49,8 @@ export function determineRepetitionCount(description: string): { totalAmount: nu
 
 export function buildNewRepetitionString(repetitionInfo: RepetitonInfo) {
 	if (repetitionInfo.endDate)
-		return `$rep:${repetitionInfo.schedule.getSanitizedScheduleString()}:${format(repetitionInfo.endDate, 'yyyy-MM-dd')}`
+		return `$rep:${repetitionInfo.schedule}:${format(repetitionInfo.endDate, 'yyyy-MM-dd')}`
-	return `$rep:${repetitionInfo.schedule.getSanitizedScheduleString()}:${repetitionInfo.alreadyOccured + 1}/${repetitionInfo.totalAmount}`
+	return `$rep:${repetitionInfo.schedule}:${repetitionInfo.alreadyOccured + 1}/${repetitionInfo.totalAmount}`
 }
 
 export function addRepetitonStringToEventDescription(oldguildScheduledEvent: string, newRepetitonString: string): string | undefined {
@@ -103,7 +104,6 @@ export function checkIfRepetitionStringIsValid(description: string): string {
 }
 
 export async function validateRepetitionStringAndSendMessageOnFail(event: GuildScheduledEvent): Promise<void> {
-	console.log('This should not be accessed')
 
 	const validResponses = [
 		'valid',
@@ -114,6 +114,13 @@ export async function validateRepetitionStringAndSendMessageOnFail(event: GuildS
 		// do success things?
 	} else {
 		const creatorMessage = `The repetition string in your event could not be parsed. Reason: ${resultstring}`
-		sendFailureDM(creatorMessage, event.creatorId ?? undefined)
+		console.log(creatorMessage)
+		if (!event.creatorId) throw new CustomError('No creator ID present', errorCodes.no_creator_id)
+		const creator = await client.users.fetch(event.creatorId)
+		console.log(`Creator ${JSON.stringify(creator)}`)
+		if (creator)
+			if (!creator.dmChannel)
+				await creator.createDM()
+		await creator.dmChannel?.send(creatorMessage)
 	}
 }

server/handler/repeatingEvents/repeatingEvents.controller.ts

@@ -18,16 +18,11 @@ export function handleRepeatingEvent(oldguildScheduledEvent: GuildScheduledEvent
 	if (needsToBeRepeated(repetitionInfo)) {
 		try {
 
-			const newDate = repetitionInfo.schedule.getNewDate(oldguildScheduledEvent.scheduledStartAt)
-			if (repetitionInfo.endDate && (repetitionInfo.endDate <= newDate)) {
-				console.log(`Wont repeat: EndDate: ${repetitionInfo.endDate} RepetitionDate: ${newDate}`)
-				return
-			}
 			const newRepetitonString = buildNewRepetitionString(repetitionInfo)
 			const newEventOptions: GuildScheduledEventCreateOptions = {
 				name: oldguildScheduledEvent.name,
 				description: addRepetitonStringToEventDescription(oldguildScheduledEvent.description, newRepetitonString),
-				scheduledStartTime: newDate,
+				scheduledStartTime: repetitionInfo.schedule.getNewDate(oldguildScheduledEvent.scheduledStartAt),
 				privacyLevel: oldguildScheduledEvent.privacyLevel,
 				entityType: oldguildScheduledEvent.entityType,
 				channel: oldguildScheduledEvent.channel?.id,

server/helper/sendFailureDM.ts

@@ -1,12 +0,0 @@
-import { client } from "../.."
-import { CustomError, errorCodes } from "../interfaces"
-
-export async function sendFailureDM(creatorMessage: string, creatorId?: string): Promise<void> {
-	if (!creatorId) throw new CustomError('No creator ID present', errorCodes.no_creator_id)
-	const creator = await client.users.fetch(creatorId)
-	console.log(`Creator ${JSON.stringify(creator)}`)
-	if (creator)
-		if (!creator.dmChannel)
-			await creator.createDM()
-	await creator.dmChannel?.send(creatorMessage)
-}

server/helper/typeFind.ts

@@ -0,0 +1,14 @@
+import { CustomError, errorCodes } from "../interfaces";
+import { scheduleNames, supportedSchedule } from "../types/scheduledEventTypes";
+
+export function findInScheduleTypes(inputString: string): supportedSchedule {
+	const maybeScheduleName: unknown = JSON.parse(`"${inputString.toLowerCase()}"`);
+	const scheduleName = scheduleNames.find((validName: supportedSchedule) => validName === maybeScheduleName);
+	if (scheduleName) {
+		// `sheepName` comes from the list of `sheepNames` so the compiler is happy.
+		return scheduleName;
+	}
+	throw new CustomError('That is not a schedule name.', errorCodes.schedule_not_supported);
+}
+
+

server/structures/client.ts

@@ -11,7 +11,6 @@ export class ExtendedClient extends Client {
 		super({ intents: [Intents.FLAGS.GUILDS, Intents.FLAGS.GUILD_SCHEDULED_EVENTS] })
 	}
 	public start() {
-		if (process.env.NODE_ENV === 'test') return
 		const promises = []
 		promises.push(this.registerSlashCommands())
 		promises.push(this.registerEventCallback())

server/types/scheduledEventTypes.ts

@@ -66,9 +66,6 @@ export class Schedule {
 				throw new CustomError('Schedule type not supported', errorCodes.schedule_not_supported)
 		}
 	}
-	public getSanitizedScheduleString(): string {
-		return this._scheduleString
-	}
 	private getBaseScheduleNameFromVariableString(): string {
 		if (this._scheduleString.includes('week')) return 'weekly'
 		if (this._scheduleString.includes('day')) return 'daily'

tests/createdEvent.test.ts

@@ -3,7 +3,6 @@ import { getRepetitonInfo } from "../server/handler/repeatingEvents/helper"
 describe('ScheduledEvent Creation Events', () => {
 
 	test('Daily Event with absolute end date', () => {
-		jest.mock('../server/helper/sendFailureDM.ts')
 		const eventObject = {
 			"id": "965576921410859018",
 			"guildId": "907936880190967850",
@@ -22,11 +21,10 @@ describe('ScheduledEvent Creation Events', () => {
 			"entityMetadata": null
 		}
 		const rInfo = getRepetitonInfo(eventObject.description)
-		const expectedSchedule = { "_scheduleString": "daily", "baseScheduleTypes": ["daily", "weekly", "monthly", "yearly"], "duration": { "days": 1 }, "multiplier": 1, "scheduleName": "daily" }
 		expect(rInfo).toBeDefined()
 		expect(rInfo.endDate).toBeDefined()
 		expect(rInfo.endDate).toEqual(new Date("2022-05-22"))
-		expect(rInfo.schedule).toEqual(expectedSchedule)
+		expect(rInfo.schedule).toEqual('daily')
 	})
 
 })

tests/repetition.test.ts

@@ -1,35 +1,40 @@
-import { Schedule } from '../server/types/scheduledEventTypes'
+import { findInScheduleTypes } from '../server/helper/typeFind'
-import { buildNewRepetitionString, getRepetitonInfo } from '../server/handler/repeatingEvents/helper'
+import { supportedSchedule } from '../server/types/scheduledEventTypes'
+import { createEventInGuild, getRepetitonInfo } from '../server/handler/repeatingEvents/helper'
 import { RepetitonInfo } from '../server/types/scheduledEventTypes'
+import { handleRepeatingEvent } from '../server/handler/repeatingEvents/repeatingEvents.controller'
+import { GuildScheduledEventCreateOptions } from 'discord.js'
+describe('Schedule names are parsed correctly', () => {
+	const dailyValue: supportedSchedule = 'daily'
+	const weeklyValue: supportedSchedule = 'weekly'
+	const monthlyValue: supportedSchedule = 'monthly'
+	test('Easy schedule names', () => {
+		expect(findInScheduleTypes('daily')).toEqual(dailyValue)
+		expect(findInScheduleTypes('weekly')).toEqual(weeklyValue)
+		expect(findInScheduleTypes('monthly')).toEqual(monthlyValue)
+	})
+	test('Medium schedule names', () => {
+		expect(findInScheduleTypes('Daily')).toEqual(dailyValue)
+		expect(findInScheduleTypes('Weekly')).toEqual(weeklyValue)
+		expect(findInScheduleTypes('Monthly')).toEqual(monthlyValue)
+		expect(findInScheduleTypes('DAILY')).toEqual(dailyValue)
+		expect(findInScheduleTypes('WEEKLy')).toEqual(weeklyValue)
+		expect(findInScheduleTypes('MONTHly')).toEqual(monthlyValue)
+	})
+})
 describe('Parsing of Repetition Info from Description String', () => {
 	test('Happy Path', () => {
 		const inputString = '$rep:daily:1/3'
 		const expectedInfo: RepetitonInfo = {
 			totalAmount: 3,
 			alreadyOccured: 1,
-			schedule: new Schedule('daily')
+			schedule: 'daily'
 		}
+
 		expect(getRepetitonInfo(inputString)).toEqual(expectedInfo)
 	})
 
 })
-describe('new RepetitionString for complex schedule', () => {
-	const repString = '$rep:EvEry3WeeKs:2022-12-01'
-	const repInfo = getRepetitonInfo(repString)
-	const schedule = new Schedule(repString)
-	const str = schedule.getSanitizedScheduleString()
-	expect(str).toEqual('$rep:every3weeks:2022-12-01')
-	const oldDate = new Date('2022-01-01')
-	const newDate = schedule.getNewDate(oldDate)
-	expect(newDate).toEqual(new Date('2022-01-22'))
-	expect(buildNewRepetitionString(repInfo)).toEqual('$rep:every3weeks:2022-12-01')
-})
-describe('new RepetitionString for complex schedule', () => {
-	const repString = '$rep:EvEry3WeeKs:2022-12-01'
-	const schedule = new Schedule(repString)
-	const oldDate = new Date('2022-01-01')
-	const newDate = schedule.getNewDate(oldDate)
-})
 const oldEvent = {
 	"id": "965576921410859018",
 	"guildId": "907936880190967850",
@@ -68,25 +73,24 @@ const newEvent = {
 	"creator": null,
 	guild: {}
 }
-jest.mock('../server/helper/sendFailureDM.ts')
 jest.mock('../server/handler/repeatingEvents/helper.ts', () => ({
 	...(jest.requireActual('../server/handler/repeatingEvents/helper.ts')),
 	createEventInGuild: jest.fn().mockImplementation((opt: any) => {
 		return
 	})
 }))
-//test('handleRepeatingEvent', () => {
+test('handleRepeatingEvent', () => {
-//
+
-//	const expectedOptions: GuildScheduledEventCreateOptions = {
+	const expectedOptions: GuildScheduledEventCreateOptions = {
-//		channel: "",
+		channel: "",
-//		description: "",
+		description: "",
-//		name: newEvent.name,
+		name: newEvent.name,
-//		entityType: <'VOICE'>newEvent.entityType,
+		entityType: <'VOICE'>newEvent.entityType,
-//		privacyLevel: <'GUILD_ONLY'>newEvent.privacyLevel,
+		privacyLevel: <'GUILD_ONLY'>newEvent.privacyLevel,
-//		reason: 'Repetition',
+		reason: 'Repetition',
-//		scheduledStartTime: ""
+		scheduledStartTime: ""
-//	}
+	}
-//	//@ts-ignore
+	//@ts-ignore
-//	//handleRepeatingEvent(oldEvent, newEvent)
+	handleRepeatingEvent(oldEvent, newEvent)
-//	expect(createEventInGuild).toHaveBeenCalledWith({}, expectedOptions)
+	expect(createEventInGuild).toHaveBeenCalledWith({}, expectedOptions)
-//})
+})