T #98 unfinished attempt to fix timing and dates

HueByte · Oct 9, 2022 · 1dc5835 · 1dc5835
1 parent 7f16552
commit 1dc5835
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/src/Huppy/Huppy.Core/Services/Reminder/ReminderService.cs b/src/Huppy/Huppy.Core/Services/Reminder/ReminderService.cs
@@ -19,7 +19,7 @@ public class ReminderService : IReminderService
     private readonly IEventLoopService _eventService;
     private readonly InteractionService _interactionService;
     private DateTime FetchingDate => DateTime.UtcNow + FetchReminderFrequency;
-    public TimeSpan FetchReminderFrequency { get; } = new(1, 0, 0);
+    public TimeSpan FetchReminderFrequency { get; } = new(0, 0, 30);
     private readonly ReminderProto.ReminderProtoClient _reminderClient;
     public ReminderService(IEventLoopService eventService, ILogger<ReminderService> logger, DiscordShardedClient discord, InteractionService interactionService, ITimedEventsService timedEventsService, ReminderProto.ReminderProtoClient reminderClient)
     {
@@ -50,7 +50,6 @@ public async Task RegisterFreshRemindersAsync()
     {
         var reminders = await _reminderClient.GetReminderBatchAsync(new ReminderBatchInput()
         {
-            StartDate = Miscellaneous.DateTimeToUnixTimestamp(DateTime.UtcNow),
             EndDate = Miscellaneous.DateTimeToUnixTimestamp(DateTime.UtcNow + FetchReminderFrequency)
         });
 

diff --git a/src/Huppy/Huppy.Core/Utilities/Miscellaneous.cs b/src/Huppy/Huppy.Core/Utilities/Miscellaneous.cs
@@ -18,7 +18,7 @@ public static DateTime UnixTimeStampToDateTime(ulong unixTimeStamp)
         {
             // Unix timestamp is seconds past epoch
             DateTime dateTime = new(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
-            dateTime = dateTime.AddSeconds(unixTimeStamp).ToLocalTime();
+            dateTime = dateTime.AddSeconds(unixTimeStamp);
             return dateTime;
         }
     }

diff --git a/src/HuppyService/HuppyService.Core/Utilities/Miscellaneous.cs b/src/HuppyService/HuppyService.Core/Utilities/Miscellaneous.cs
@@ -13,7 +13,7 @@ public static DateTime UnixTimeStampToDateTime(ulong unixTimeStamp)
         {
             // Unix timestamp is seconds past epoch
             DateTime dateTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
-            dateTime = dateTime.AddSeconds(unixTimeStamp).ToLocalTime();
+            dateTime = dateTime.AddSeconds(unixTimeStamp);
             return dateTime;
         }
 

diff --git a/src/HuppyService/HuppyService.Service/Protos/reminder.proto b/src/HuppyService/HuppyService.Service/Protos/reminder.proto
@@ -37,8 +37,7 @@ message GetReminderInput {
 }
 
 message ReminderBatchInput {
-	uint64 StartDate = 1;
-	uint64 EndDate = 2;
+	uint64 EndDate = 1;
 }
 
 message ReminderUserInput {

diff --git a/src/HuppyService/HuppyService.Service/Services/ReminderService.cs b/src/HuppyService/HuppyService.Service/Services/ReminderService.cs
@@ -88,13 +88,13 @@ public override async Task<ReminderModel> AddReminder(ReminderModel request, Ser
             _logger.LogInformation("Registering fresh bulk of reminders");
 
             // fetch reminders between dates
-            var remindDateStart = Miscellaneous.UnixTimeStampToDateTime(request.StartDate);
+            //var remindDateStart = Miscellaneous.UnixTimeStampToDateTime(request.StartDate);
             var remindDateEnd = Miscellaneous.UnixTimeStampToDateTime(request.EndDate);
 
             var remindersQueryable = await _reminderRepository.GetAllAsync();
 
             var reminders = await remindersQueryable
-                .Where(reminder => remindDateStart < remindDateEnd)
+                .Where(reminder => reminder.RemindDate < remindDateEnd)
                 .ToListAsync();
 
             if (!reminders.Any()) return new();