From 6de71121dce5698fdbf37bf134664927bc53fc3d Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Thu, 28 Jul 2022 22:50:26 +0300
Subject: [PATCH] db.calendar -> db.calendarEvents

---
 TODO.md                       | 2 +-
 app/db/index.ts               | 4 ++--
 app/routes/calendar/$id.tsx   | 4 ++--
 app/routes/calendar/index.tsx | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/TODO.md b/TODO.md
index 590c5f842..f817a5ce2 100644
--- a/TODO.md
+++ b/TODO.md
@@ -23,5 +23,5 @@ Calendar
 - [x] Maybe classNames that do nothing on calendar event page?
 - [ ] refactor global.css/common.css -> variables.css / utils.css / common.css
 - [ ] addTagArray get tags type from constant
-- [ ] Rename model events -> calendarEvents
+- [x] Rename model events -> calendarEvents
 - [x] On the event page should not say Day 1 if only one day
diff --git a/app/db/index.ts b/app/db/index.ts
index d359266fb..f4cc1a7e3 100644
--- a/app/db/index.ts
+++ b/app/db/index.ts
@@ -2,12 +2,12 @@ import * as users from "./models/users.server";
 import * as plusSuggestions from "./models/plusSuggestions.server";
 import * as plusVotes from "./models/plusVotes.server";
 import * as badges from "./models/badges.server";
-import * as calendar from "./models/calendar.server";
+import * as calendarEvents from "./models/calendar.server";
 
 export const db = {
   users,
   plusSuggestions,
   plusVotes,
   badges,
-  calendar,
+  calendarEvents,
 };
diff --git a/app/routes/calendar/$id.tsx b/app/routes/calendar/$id.tsx
index 8c070477a..65da28f18 100644
--- a/app/routes/calendar/$id.tsx
+++ b/app/routes/calendar/$id.tsx
@@ -31,11 +31,11 @@ export const loader = ({ params }: LoaderArgs) => {
   const parsedParams = z
     .object({ id: z.preprocess(actualNumber, id) })
     .parse(params);
-  const event = notFoundIfFalsy(db.calendar.findById(parsedParams.id));
+  const event = notFoundIfFalsy(db.calendarEvents.findById(parsedParams.id));
 
   return json({
     event,
-    badgePrizes: db.calendar.findBadgesById(parsedParams.id),
+    badgePrizes: db.calendarEvents.findBadgesById(parsedParams.id),
   });
 };
 
diff --git a/app/routes/calendar/index.tsx b/app/routes/calendar/index.tsx
index de2205310..c37947681 100644
--- a/app/routes/calendar/index.tsx
+++ b/app/routes/calendar/index.tsx
@@ -74,7 +74,7 @@ export const loader = async ({ request }: LoaderArgs) => {
   return json({
     currentWeek,
     displayedWeek,
-    nearbyStartTimes: db.calendar.startTimesOfRange({
+    nearbyStartTimes: db.calendarEvents.startTimesOfRange({
       startTime: subMonths(
         weekNumberToDate({ week: displayedWeek, year: displayedYear }),
         1
@@ -114,7 +114,7 @@ function fetchEventsOfWeek(args: { week: number; year: number }) {
   // so we get all events of sunday even from US west coast perspective
   endTime.setHours(endTime.getHours() + 12);
 
-  return db.calendar.findAllBetweenTwoTimestamps({ startTime, endTime });
+  return db.calendarEvents.findAllBetweenTwoTimestamps({ startTime, endTime });
 }
 
 export default function CalendarPage() {