Update controllers

Author: nora-soderlund

package-lock.json

@@ -2,7 +2,7 @@
   "name": "test-service",
   "version": "0.0.0",
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20230404.0",
+    "@cloudflare/workers-types": "^4.20230518.0",
     "@types/itty-router-extras": "^0.4.0",
     "better-sqlite3": "^8.0.1",
     "dotenv": "^16.0.3",

package.json

@@ -1,7 +1,7 @@
 import { ActivityComment } from "../../../models/activityComment";
 import { getActivityCommentById } from "./getActivityCommentById";
 
-export async function createActivityComment(database: D1Database, activity: string, user: string, parent: string | null, message: string): Promise<ActivityComment | null> {
+export async function createActivityComment(database: D1Database, activity: string, user: string, parent: string | null, message: string): Promise<ActivityComment> {
     const id = crypto.randomUUID();
     const timestamp = Date.now();
 

src/controllers/activities/comments/createActivityComment.ts

@@ -2,6 +2,6 @@ import { Activity } from "../../../models/activity";
 import { ActivityComment } from "../../../models/activityComment";
 import { ActivitySummary } from "../../../models/activitySummary";
 
-export async function getActivityCommentById(database: D1Database, id: string): Promise<ActivityComment | null> {
+export async function getActivityCommentById(database: D1Database, id: string): Promise<ActivityComment> {
     return await database.prepare("SELECT * FROM activity_comments WHERE id = ?").bind(id).first();
 };

src/controllers/activities/comments/getActivityCommentById.ts

@@ -2,6 +2,6 @@ import { Activity } from "../../../models/activity";
 import { ActivityComment } from "../../../models/activityComment";
 import { ActivitySummary } from "../../../models/activitySummary";
 
-export async function getActivityCommentSummaryByParent(database: D1Database, parent: string): Promise<ActivityComment | null> {
+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();
 };

src/controllers/activities/comments/getActivityCommentSummaryByParent.ts

@@ -2,6 +2,6 @@ import { Activity } from "../../../models/activity";
 import { ActivityComment } from "../../../models/activityComment";
 import { ActivitySummary } from "../../../models/activitySummary";
 
-export async function getActivityComments(database: D1Database, activity: string): Promise<ActivityComment[] | null> {
-    return (await database.prepare("SELECT * FROM activity_comments WHERE activity = ? ORDER BY timestamp DESC").bind(activity).all<ActivityComment>()).results ?? null;
+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 ?? [];
 };

src/controllers/activities/comments/getActivityComments.ts

@@ -1,3 +1,3 @@
-export async function getActivityCommentsCount(database: D1Database, activity: string): Promise<number | null> {
+export async function getActivityCommentsCount(database: D1Database, activity: string): Promise<number> {
     return await database.prepare("SELECT COUNT(*) AS count FROM activity_comments WHERE activity = ?").bind(activity).first<number>("count");
 };

src/controllers/activities/comments/getActivityCommentsCount.ts

@@ -2,11 +2,11 @@ import { Activity } from "../../../models/activity";
 import { ActivityComment } from "../../../models/activityComment";
 import { ActivitySummary } from "../../../models/activitySummary";
 
-export async function getActivityCommentsSummary(database: D1Database, activity: string): Promise<(ActivityComment & { comments_count?: number })[] | null> {
+export async function getActivityCommentsSummary(database: D1Database, activity: string): Promise<(ActivityComment & { comments_count?: number })[]> {
     return (await database.prepare(
         "SELECT c1.*, COUNT(c2.id) AS comments_count FROM activity_comments c1" +
         " LEFT JOIN (SELECT * FROM activity_comments WHERE parent IS NOT NULL) c2 ON c1.id = c2.parent" +
         " WHERE c1.parent IS NULL AND c1.activity = ?" +
         " GROUP BY c1.id ORDER BY MAX(c1.timestamp, COALESCE(c2.timestamp, 0)) DESC LIMIT 2"
-        ).bind(activity).all<ActivityComment & { comments_count?: number }>()).results ?? null;
+        ).bind(activity).all<ActivityComment & { comments_count?: number }>()).results ?? [];
 };

src/controllers/activities/comments/getActivityCommentsSummary.ts

@@ -2,6 +2,6 @@ import { Activity } from "../../../models/activity";
 import { ActivityComment } from "../../../models/activityComment";
 import { ActivitySummary } from "../../../models/activitySummary";
 
-export async function getLatestActivityComment(database: D1Database, activity: string): Promise<ActivityComment | null> {
+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();
 };

src/controllers/activities/comments/getLatestActivityComment.ts

@@ -1,7 +1,7 @@
 import { ActivityComment } from "../../../models/activityComment";
 import { getActivityCommentById } from "./getActivityCommentById";
 
-export async function setActivityCommentMessage(database: D1Database, comment: string, message: string): Promise<ActivityComment | null> {
+export async function setActivityCommentMessage(database: D1Database, comment: string, message: string): Promise<ActivityComment> {
     await database.prepare("UPDATE activity_comments SET message = ? WHERE id = ?").bind(message, comment).run();
 
     return await getActivityCommentById(database, comment);