feat: check if birthday exists before update, remove or show

willy-r · Apr 27, 2024 · b52bdb9 · b52bdb9
1 parent 145efd9
commit b52bdb9
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/src/commands/birthday/remove.js b/src/commands/birthday/remove.js
@@ -1,6 +1,6 @@
 const { SlashCommandBuilder } = require('discord.js');
 
-const { deleteByUserAndGuild } = require('../../repositories/birthdayRepository');
+const { deleteByUserAndGuild, findByUserAndGuild } = require('../../repositories/birthdayRepository');
 
 module.exports = {
   data: new SlashCommandBuilder()
@@ -20,6 +20,13 @@ module.exports = {
     const { id: guildId } = interaction.guild;
 
     try {
+      const birthday = await findByUserAndGuild(userId, guildId);
+
+      if (birthday === null) {
+        await interaction.reply('I didn\'t find birthday information for this user on this server to update 😥');
+        return;
+      }
+
       await deleteByUserAndGuild(userId, guildId);
       await interaction.reply('From now, I can\'t remember your birthday 😥');
     }

diff --git a/src/commands/birthday/show.js b/src/commands/birthday/show.js
@@ -22,12 +22,19 @@ module.exports = {
 
     try {
       const birthdayData = await findByUserAndGuild(userId, guildId);
+
+      if (birthdayData === null) {
+        await interaction.reply('I didn\'t find birthday information for this user on this server to show 😥');
+        return;
+      }
+
       const options = {
         month: 'numeric',
         day: 'numeric',
       };
-      const formattedDate = birthdayData.birthdate.toLocaleDateString('pt-BR', options);
-      const formattedTimeUntilBirthday = timeUntilBirthday(birthdayData.birthdate);
+      const { birthdate } = birthdayData;
+      const formattedDate = birthdate.toLocaleDateString('pt-BR', options);
+      const formattedTimeUntilBirthday = timeUntilBirthday(birthdate);
 
       let message = `According to my records, your birthday is ${formattedTimeUntilBirthday} away as it falls on ${formattedDate}`;
 

diff --git a/src/commands/birthday/update.js b/src/commands/birthday/update.js
@@ -1,6 +1,6 @@
 const { SlashCommandBuilder } = require('discord.js');
 
-const { updateByUserAndGuild } = require('../../repositories/birthdayRepository');
+const { updateByUserAndGuild, findByUserAndGuild } = require('../../repositories/birthdayRepository');
 const { parseDateStringToDate, isDateInFuture } = require('../../utils/date');
 
 module.exports = {
@@ -44,9 +44,16 @@ module.exports = {
 
     const birthdayData = {
       show_age: showAge,
-      birthdate,
+      birthdate: birthdateToDate,
     };
     try {
+      const birthday = await findByUserAndGuild(userId, guildId);
+
+      if (birthday === null) {
+        await interaction.reply('I didn\'t find birthday information for this user on this server to update 😥');
+        return;
+      }
+
       await updateByUserAndGuild(userId, guildId, birthdayData);
       await interaction.reply('Your birthday has been updated successfully! 🎉');
     }