Added types package

nora-soderlund · nora-soderlund · commit 6c8de608991b · 2023-08-04T20:43:27.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,7 +4,9 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230518.0",
     "@ridetracker/ridetrackerclient": "^0.9.36",
+    "@ridetracker/ridetrackertypes": "^0.9.6",
     "@types/itty-router-extras": "^0.4.0",
+    "@typescript-eslint/eslint-plugin": "^6.2.1",
     "lorem-ipsum": "^2.0.8",
     "typescript": "^5.0.3",
     "vitest": "^0.30.0",
diff --git a/src/controllers/activities/comments/createActivityComment.ts b/src/controllers/activities/comments/createActivityComment.ts
@@ -1,4 +1,4 @@
-import { ActivityComment } from "../../../models/activityComment";
+import { ActivityComment } from "@ridetracker/ridetrackertypes";
 import { getActivityCommentById } from "./getActivityCommentById";
 
 export async function createActivityComment(database: D1Database, activity: string, user: string, parent: string | null, message: string): Promise<ActivityComment> {
diff --git a/src/controllers/activities/comments/deleteActivityComent.ts b/src/controllers/activities/comments/deleteActivityComent.ts
@@ -1,4 +1,4 @@
-import { ActivityComment } from "../../../models/activityComment";
+import { ActivityComment } from "@ridetracker/ridetrackertypes";
 import { getActivityCommentById } from "./getActivityCommentById";
 
 export async function deleteActivityCommentMessage(database: D1Database, comment: string): Promise<void> {
diff --git a/src/controllers/activities/comments/getActivityCommentById.ts b/src/controllers/activities/comments/getActivityCommentById.ts
@@ -1,6 +1,6 @@
-import { Activity } from "../../../models/activity";
-import { ActivityComment } from "../../../models/activityComment";
-import { ActivitySummary } from "../../../models/activitySummary";
+import { Activity } from "@ridetracker/ridetrackertypes";
+import { ActivityComment } from "@ridetracker/ridetrackertypes";
+import { ActivitySummary } from "@ridetracker/ridetrackertypes";
 
 export async function getActivityCommentById(database: D1Database, id: string): Promise<ActivityComment> {
     return await database.prepare("SELECT * FROM activity_comments WHERE id = ?").bind(id).first();
diff --git a/src/controllers/activities/comments/getActivityCommentSummaryByParent.ts b/src/controllers/activities/comments/getActivityCommentSummaryByParent.ts
@@ -1,6 +1,6 @@
-import { Activity } from "../../../models/activity";
-import { ActivityComment } from "../../../models/activityComment";
-import { ActivitySummary } from "../../../models/activitySummary";
+import { Activity } from "@ridetracker/ridetrackertypes";
+import { ActivityComment } from "@ridetracker/ridetrackertypes";
+import { ActivitySummary } from "@ridetracker/ridetrackertypes";
 
 export async function getActivityCommentSummaryByParent(database: D1Database, parent: string): Promise<ActivityComment> {
     return await database.prepare("SELECT *, COUNT(activity_comments.id) AS count FROM activity_comments WHERE parent = ?").bind(parent).first();
diff --git a/src/controllers/activities/comments/getActivityComments.ts b/src/controllers/activities/comments/getActivityComments.ts
@@ -1,6 +1,6 @@
-import { Activity } from "../../../models/activity";
-import { ActivityComment } from "../../../models/activityComment";
-import { ActivitySummary } from "../../../models/activitySummary";
+import { Activity } from "@ridetracker/ridetrackertypes";
+import { ActivityComment } from "@ridetracker/ridetrackertypes";
+import { ActivitySummary } from "@ridetracker/ridetrackertypes";
 
 export async function getActivityComments(database: D1Database, activity: string): Promise<ActivityComment[]> {
     return (await database.prepare("SELECT * FROM activity_comments WHERE activity = ? ORDER BY timestamp DESC").bind(activity).all<ActivityComment>()).results ?? [];
diff --git a/src/controllers/activities/comments/getActivityCommentsSummary.ts b/src/controllers/activities/comments/getActivityCommentsSummary.ts
@@ -1,6 +1,6 @@
-import { Activity } from "../../../models/activity";
-import { ActivityComment } from "../../../models/activityComment";
-import { ActivitySummary } from "../../../models/activitySummary";
+import { Activity } from "@ridetracker/ridetrackertypes";
+import { ActivityComment } from "@ridetracker/ridetrackertypes";
+import { ActivitySummary } from "@ridetracker/ridetrackertypes";
 
 export async function getActivityCommentsSummary(database: D1Database, activity: string): Promise<(ActivityComment & { comments_count?: number })[]> {
     return (await database.prepare(
diff --git a/src/controllers/activities/comments/getLatestActivityComment.ts b/src/controllers/activities/comments/getLatestActivityComment.ts
@@ -1,6 +1,6 @@
-import { Activity } from "../../../models/activity";
-import { ActivityComment } from "../../../models/activityComment";
-import { ActivitySummary } from "../../../models/activitySummary";
+import { Activity } from "@ridetracker/ridetrackertypes";
+import { ActivityComment } from "@ridetracker/ridetrackertypes";
+import { ActivitySummary } from "@ridetracker/ridetrackertypes";
 
 export async function getLatestActivityComment(database: D1Database, activity: string): Promise<ActivityComment> {
     return await database.prepare("SELECT * FROM activity_comments WHERE activity = ? ORDER BY timestamp DESC LIMIT 1").bind(activity).first();
diff --git a/src/controllers/activities/comments/setActivityComentMessage.ts b/src/controllers/activities/comments/setActivityComentMessage.ts
@@ -1,4 +1,4 @@
-import { ActivityComment } from "../../../models/activityComment";
+import { ActivityComment } from "@ridetracker/ridetrackertypes";
 import { getActivityCommentById } from "./getActivityCommentById";
 
 export async function setActivityCommentMessage(database: D1Database, comment: string, message: string): Promise<ActivityComment> {
diff --git a/src/controllers/activities/createActivity.ts b/src/controllers/activities/createActivity.ts
@@ -1,5 +1,4 @@
-import { ActivityVisibility } from "../../models/ActivityVisibility";
-import { Activity } from "../../models/activity";
+import { Activity, ActivityVisibility } from "@ridetracker/ridetrackertypes";
 import { getActivityById } from "./getActivityById";
 
 export async function createActivity(database: D1Database, user: string, visibility: ActivityVisibility, localId: string): Promise<Activity> {
diff --git a/src/controllers/activities/getActivities.ts b/src/controllers/activities/getActivities.ts
@@ -1,4 +1,4 @@
-import { Activity } from "../../models/activity";
+import { Activity } from "@ridetracker/ridetrackertypes";
 
 export async function getActivities(database: D1Database): Promise<Activity[]> {
     return (await database.prepare("SELECT start_area AS startArea, finish_area AS finishArea, local_id AS localId, activities.* FROM activities ORDER BY timestamp DESC").all<Activity>()).results ?? [];
diff --git a/src/controllers/activities/getActivitiesByFeed.ts b/src/controllers/activities/getActivitiesByFeed.ts
@@ -1,4 +1,4 @@
-import { Activity } from "../../models/activity";
+import { Activity } from "@ridetracker/ridetrackertypes";
 
 function getTimestampByTimeline(timeline?: string) {
     switch(timeline) {
diff --git a/src/controllers/activities/getActivitiesByUser.ts b/src/controllers/activities/getActivitiesByUser.ts
@@ -1,4 +1,4 @@
-import { Activity } from "../../models/activity";
+import { Activity } from "@ridetracker/ridetrackertypes";
 
 export async function getActivitiesByUser(database: D1Database, user: string, offset: number = 0): Promise<Activity[]> {
     return (await database.prepare("SELECT start_area AS startArea, finish_area AS finishArea, local_id AS localId, activities.* FROM activities WHERE user = ? AND status = 'processed' ORDER BY timestamp DESC LIMIT 10 OFFSET ?").bind(user, offset).all<Activity>()).results ?? [];
diff --git a/src/controllers/activities/getActivitiesWithoutSummary.ts b/src/controllers/activities/getActivitiesWithoutSummary.ts
@@ -1,4 +1,4 @@
-import { Activity } from "../../models/activity";
+import { Activity } from "@ridetracker/ridetrackertypes";
 
 export async function getActivitiesWithoutSummary(database: D1Database): Promise<Activity[]> {
     return (await database.prepare("SELECT start_area AS startArea, finish_area AS finishArea, local_id AS localId, activities.* FROM activities WHERE (SELECT COUNT(id) FROM activity_summary WHERE activity_summary.id = activities.id) = 0 ORDER BY activities.timestamp ASC").all<Activity>()).results ?? [];
diff --git a/src/controllers/activities/getActivityById.ts b/src/controllers/activities/getActivityById.ts
@@ -1,4 +1,4 @@
-import { Activity } from "../../models/activity";
+import { Activity } from "@ridetracker/ridetrackertypes";
 
 export async function getActivityById(database: D1Database, id: string): Promise<Activity> {
     return await database.prepare("SELECT start_area AS startArea, finish_area AS finishArea, local_id AS localId, activities.* FROM activities WHERE id = ?").bind(id).first<Activity>();
diff --git a/src/controllers/activities/getActivityByLocalId.ts b/src/controllers/activities/getActivityByLocalId.ts
@@ -1,4 +1,4 @@
-import { Activity } from "../../models/activity";
+import { Activity } from "@ridetracker/ridetrackertypes";
 
 export async function getActivityByLocalId(database: D1Database, userId: string, localId: string): Promise<Activity | null> {
     return await database.prepare("SELECT start_area AS startArea, finish_area AS finishArea, local_id AS localId, activities.* FROM activities WHERE user = ? AND local_id = ?").bind(userId, localId).first<Activity | null>();
diff --git a/src/controllers/activities/likes/getActivityLikeByUser.ts b/src/controllers/activities/likes/getActivityLikeByUser.ts
@@ -1,6 +1,5 @@
-import { ActivityLike } from "../../../models/activityLike";
+import { ActivityLike } from "@ridetracker/ridetrackertypes";
 
 export async function getActivityLikeByUser(database: D1Database, activity: string, user: string): Promise<ActivityLike> {
     return await database.prepare("SELECT * FROM activity_likes WHERE activity = ? AND user = ?").bind(activity, user).first<ActivityLike>();
-    
 };
diff --git a/src/controllers/activities/summary/createActivitySummary.ts b/src/controllers/activities/summary/createActivitySummary.ts
@@ -1,4 +1,4 @@
-import { ActivitySummary } from "../../../models/activitySummary";
+import { ActivitySummary } from "@ridetracker/ridetrackertypes";
 
 export async function createActivitySummary(database: D1Database, id: string, key: string, value: number): Promise<void> {
     const timestamp = Date.now();
diff --git a/src/controllers/activities/summary/getActivitySummaryByBike.ts b/src/controllers/activities/summary/getActivitySummaryByBike.ts
@@ -1,4 +1,4 @@
-import { ActivitySummary } from "../../../models/activitySummary";
+import { ActivitySummary } from "@ridetracker/ridetrackertypes";
 
 export async function getActivitySummaryByBike(database: D1Database, bikeId: string): Promise<ActivitySummary[]> {
     return (await database.prepare("SELECT key, value FROM (SELECT 'activities' AS key, COUNT(id) AS value FROM activities WHERE bike = ?1 UNION ALL SELECT activity_summary.key AS key, SUM(activity_summary.value) AS value FROM activity_summary INNER JOIN activities ON activities.bike = ?1 WHERE activity_summary.id = activities.id GROUP BY activity_summary.key)").bind(bikeId).all<ActivitySummary>()).results ?? [];
diff --git a/src/controllers/activities/summary/getActivitySummaryById.ts b/src/controllers/activities/summary/getActivitySummaryById.ts
@@ -1,5 +1,5 @@
-import { Activity } from "../../../models/activity";
-import { ActivitySummary } from "../../../models/activitySummary";
+import { Activity } from "@ridetracker/ridetrackertypes";
+import { ActivitySummary } from "@ridetracker/ridetrackertypes";
 
 export async function getActivitySummaryById(database: D1Database, id: string): Promise<ActivitySummary[]> {
     return (await database.prepare("SELECT personal_best AS personalBest, activity_summary.* FROM activity_summary WHERE id = ?").bind(id).all<ActivitySummary>()).results ?? [];
diff --git a/src/controllers/activities/summary/getActivitySummaryCount.ts b/src/controllers/activities/summary/getActivitySummaryCount.ts
@@ -1,5 +1,5 @@
-import { Activity } from "../../../models/activity";
-import { ActivitySummary } from "../../../models/activitySummary";
+import { Activity } from "@ridetracker/ridetrackertypes";
+import { ActivitySummary } from "@ridetracker/ridetrackertypes";
 
 export async function getActivitySummaryCount(database: D1Database, id: string): Promise<number> {
     return await database.prepare("SELECT COUNT(id) AS count FROM activity_summary WHERE id = ?").bind(id).first<number>("count");
diff --git a/src/controllers/activities/summary/updatePersonalBestActivitySummary.ts b/src/controllers/activities/summary/updatePersonalBestActivitySummary.ts
@@ -1,4 +1,4 @@
-import { ActivitySummary } from "../../../models/activitySummary";
+import { ActivitySummary } from "@ridetracker/ridetrackertypes";
 import { getActivitySummaryById } from "./getActivitySummaryById";
 
 function updatePersonalBestActivitySummaryColumn(database: D1Database, user: string, column: string) {
diff --git a/src/controllers/activities/updateActivity.ts b/src/controllers/activities/updateActivity.ts
@@ -1,4 +1,4 @@
-import { ActivityVisibility } from "../../models/ActivityVisibility";
+import { ActivityVisibility } from "@ridetracker/ridetrackertypes";
 
 export async function updateActivity(database: D1Database, activityId: string, visibility: ActivityVisibility, title: string | null, description: string | null, bike: string | null): Promise<void> {
     await database.prepare("UPDATE activities SET visibility = ?, title = ?, description = ?, bike = ? WHERE id = ?").bind(visibility, title, description, bike, activityId).run();
diff --git a/src/controllers/activities/updateActivityAreas.ts b/src/controllers/activities/updateActivityAreas.ts
@@ -1,4 +1,4 @@
-import { Activity } from "../../models/activity";
+import { Activity } from "@ridetracker/ridetrackertypes";
 
 export async function updateActivityAreas(database: D1Database, id: string, startArea: string | null, finishArea: string | null): Promise<void> {
     await database.prepare("UPDATE activities SET start_area = ?, finish_area = ? WHERE id = ?").bind(startArea, finishArea, id).run();
diff --git a/src/controllers/activities/updateActivityStatus.ts b/src/controllers/activities/updateActivityStatus.ts
@@ -1,4 +1,4 @@
-import { Activity } from "../../models/activity";
+import { Activity } from "@ridetracker/ridetrackertypes";
 
 export async function updateActivityStatus(database: D1Database, id: string, status: Activity["status"]): Promise<void> {
     await database.prepare("UPDATE activities SET status = ? WHERE id = ?").bind(status, id).run();
diff --git a/src/models/ActivityStatus.ts b/src/models/ActivityStatus.ts
diff --git a/src/models/ActivitySummaryKey.ts b/src/models/ActivitySummaryKey.ts
diff --git a/src/models/ActivityVisibility.ts b/src/models/ActivityVisibility.ts
diff --git a/src/models/activity.ts b/src/models/activity.ts
diff --git a/src/models/activityComment.ts b/src/models/activityComment.ts
diff --git a/src/models/activityLike.ts b/src/models/activityLike.ts
diff --git a/src/models/activitySummary.ts b/src/models/activitySummary.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -31,7 +31,7 @@
 		// "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
 		// "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
 		// "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-		// "typeRoots": [],                                  /* Specify multiple folders that act like `./node_modules/@types`. */
+		//"typeRoots": [],                                  /* Specify multiple folders that act like `./node_modules/@types`. */
 		"types": [
 			"@cloudflare/workers-types"
 		] /* Specify type package names to be included without being referenced in a source file. */,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ActivityComment } from "../../../models/activityComment";`
	`1`	`+import { ActivityComment } from "@ridetracker/ridetrackertypes";`
`2`	`2`	`import { getActivityCommentById } from "./getActivityCommentById";`
`3`	`3`
`4`	`4`	`export async function createActivityComment(database: D1Database, activity: string, user: string, parent: string \| null, message: string): Promise<ActivityComment> {`