Merge pull request #77 from lilith/calendar-refactor

Calendar refactor

.github/workflows/test.yml

@@ -10,6 +10,7 @@ env:
   TWILIO_ACCOUNT_SID: ${{ secrets.TWILIO_ACCOUNT_SID }}
   TWILIO_API_SECRET: ${{ secrets.TWILIO_API_SECRET }}
   TWILIO_AUTH_TOKEN: ${{ secrets.TWILIO_AUTH_TOKEN }}
+  PUBLIC_ENV: test
 jobs:
   build:
     runs-on: ubuntu-latest

package.json

@@ -6,14 +6,14 @@
 		"node": ">=18"
 	},
 	"prisma": {
-		"seed": "ts-node --transpile-only prisma/seed.ts"
+		"seed": "tsx prisma/seed.ts"
 	},
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
 		"nodebuild": "NODE_MODE_ADAPTER=1 vite build",
 		"preview": "vite preview",
-		"test": "playwright test",
+		"test": "rm -f screenshot.png && playwright test",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
 		"test:unit": "vitest",
@@ -49,17 +49,18 @@
 		"postcss": "^8.4.31",
 		"prettier": "^2.8.8",
 		"prettier-plugin-svelte": "^2.10.1",
-		"prisma": "^4.15.0",
-		"svelte": "^3.59.1",
+		"prisma": "^5.9.1",
+		"svelte": "^4.2.10",
 		"svelte-check": "^3.4.3",
 		"tailwindcss": "^3.3.2",
 		"tslib": "^2.5.2",
+		"tsx": "^4.7.1",
 		"typescript": "^5.0.4",
 		"vite": "^4.3.9",
 		"vitest": "^0.31.3"
 	},
 	"dependencies": {
-		"@prisma/client": "^4.15.0",
+		"@prisma/client": "^5.9.1",
 		"jsonwebtoken": "^9.0.0",
 		"luxon": "^3.3.0",
 		"marked": "^5.1.0",

playwright.config.ts

@@ -1,5 +1,6 @@
 import type { PlaywrightTestConfig } from '@playwright/test';
 
+export const TIMEZONE = 'America/Los_Angeles';
 const config: PlaywrightTestConfig = {
 	webServer: [
 		{
@@ -16,8 +17,14 @@ const config: PlaywrightTestConfig = {
 	expect: {
 		timeout: 3000
 	},
-	timeout: 5000,
-	testDir: 'tests'
+	// timeout: 10000,
+	testDir: 'tests',
+	testMatch: '*spec.ts',
+	use: {
+		locale: 'en-US',
+		timezoneId: TIMEZONE,
+		baseURL: 'http://localhost:5173'
+	}
 };
 
 export default config;

prisma/constants.ts

@@ -0,0 +1,3 @@
+export const USERS_WITH_NOTHING = [1, 2, 7];
+export const USERS_WITH_EMPTY_HOUSEHOLD = [3, 4];
+export const USERS_WITH_ACTIVE_SESSION = [2, 4, 6, 7];

prisma/migrations/20240216102359_availability_date_index/migration.sql

@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE UNIQUE INDEX if not exists "AvailabilityDate_householdId_date_key" ON "AvailabilityDate"("householdId", "date");

prisma/migrations/20240216110100_availability_date_year/migration.sql

@@ -0,0 +1,15 @@
+UPDATE "AvailabilityDate"
+SET 
+  "date" = "date" + INTERVAL '23 years'
+WHERE 
+  EXTRACT(MONTH FROM "date") >= 8 AND EXTRACT(YEAR FROM "date") = 2001;
+
+UPDATE "AvailabilityDate"
+SET 
+  "date" = "date" + INTERVAL '24 years'
+WHERE 
+  EXTRACT(MONTH FROM "date") < 8 AND EXTRACT(YEAR FROM "date") = 2001;
+
+-- cases
+-- if month >= 8, then year should be set to 2023
+-- if month < 8, then year should be set to 2024

prisma/schema.prisma

@@ -5,21 +5,7 @@ generator client {
 
 datasource db {
   provider = "postgresql"
-  url = env("DATABASE_PRISMA_URL") // uses connection pooling
-//  directUrl = env("DATABASE_URL_NON_POOLING") // uses a direct connection
-//  shadowDatabaseUrl = env("DATABASE_URL_NON_POOLING") // used for migrations
-}
-
-enum Pronoun {
-  FAE_FAER_FAERS
-  EEY_EM_EIRS
-  HE_HIM_HIS
-  PER_PER_PERS
-  SHE_HER_HERS
-  THEY_THEM_THEIRS
-  VE_VER_VIS
-  XE_XEM_XYRS
-  ZEZIE_HIR_HIRS
+  url      = env("DATABASE_PRISMA_URL")
 }
 
 model Household {
@@ -31,8 +17,8 @@ model Household {
   AvailabilityDate        AvailabilityDate[]
   FriendRequest           FriendRequest[]
   children                HouseholdChild[]
-  connectionsAsHouseholdA HouseholdConnection[]  @relation("HouseholdAConnection")
   connectionsAsHouseholdB HouseholdConnection[]  @relation("HouseholdBConnection")
+  connectionsAsHouseholdA HouseholdConnection[]  @relation("HouseholdAConnection")
   JoinHouseholdRequest    JoinHouseholdRequest[]
   parents                 User[]
 }
@@ -153,12 +139,24 @@ model HouseholdConnection {
   householdId       Int
   friendHouseholdId Int
   createdAt         DateTime  @default(now())
-  household     Household @relation("HouseholdAConnection", fields: [householdId], references: [id])
   friendHousehold   Household @relation("HouseholdBConnection", fields: [friendHouseholdId], references: [id])
+  household         Household @relation("HouseholdAConnection", fields: [householdId], references: [id])
 
   @@unique([householdId, friendHouseholdId])
 }
 
+enum Pronoun {
+  FAE_FAER_FAERS
+  EEY_EM_EIRS
+  HE_HIM_HIS
+  PER_PER_PERS
+  SHE_HER_HERS
+  THEY_THEM_THEIRS
+  VE_VER_VIS
+  XE_XEM_XYRS
+  ZEZIE_HIR_HIRS
+}
+
 enum AvailabilityStatus {
   UNSPECIFIED
   BUSY