resolved conflicts

1 files changed, 44 insertions, 4 deletions

diff --git a/apps/web/src/actions/db.ts b/apps/web/src/actions/db.ts
index e380d562..cd54c1bd 100644
--- a/apps/web/src/actions/db.ts
+++ b/apps/web/src/actions/db.ts
@@ -41,7 +41,8 @@ export async function searchMemoriesAndSpaces(
           eq(storedContent.user, user.id),
           like(storedContent.title, `%${query}%`),
         ),
-      );
+      )
+      .orderBy(asc(storedContent.savedAt));
 
     const searchSpacesQuery = db
       .select({
@@ -50,10 +51,13 @@ export async function searchMemoriesAndSpaces(
         memory: sql`NULL`,
       })
       .from(space)
-      .where(and(eq(space.user, user.id), like(space.name, `%${query}%`)));
+      .where(and(eq(space.user, user.id), like(space.name, `%${query}%`)))
+      .orderBy(asc(space.name));
 
     let queries = [];
 
+    console.log("adding");
+
     [undefined, true].includes(opts?.filter?.memories) &&
       queries.push(searchMemoriesQuery);
     [undefined, true].includes(opts?.filter?.spaces) &&
@@ -69,6 +73,8 @@ export async function searchMemoriesAndSpaces(
 
     const data = await Promise.all(queries);
 
+    console.log("resp", data);
+
     return data.reduce((acc, i) => [...acc, ...i]) as SearchResult[];
   } catch {
     return [];
@@ -183,7 +189,7 @@ export async function fetchContentForSpace(
           ),
       ),
     )
-    .orderBy(asc(storedContent.title));
+    .orderBy(asc(storedContent.savedAt));
 
   return range
     ? await query.limit(range.limit).offset(range.offset)
@@ -214,7 +220,7 @@ export async function fetchFreeMemories(range?: {
         eq(storedContent.user, user.id),
       ),
     )
-    .orderBy(asc(storedContent.title));
+    .orderBy(asc(storedContent.savedAt));
 
   return range
     ? await query.limit(range.limit).offset(range.offset)
@@ -257,3 +263,37 @@ export async function addMemory(
     addedToSpaces,
   };
 }
+
+export async function deleteSpace(id: number) {
+  const user = await getUser();
+
+  if (!user) {
+    return null;
+  }
+
+  await db.delete(contentToSpace).where(eq(contentToSpace.spaceId, id));
+
+  const [deleted] = await db
+    .delete(space)
+    .where(and(eq(space.user, user.id), eq(space.id, id)))
+    .returning();
+
+  return deleted;
+}
+
+export async function deleteMemory(id: number) {
+  const user = await getUser();
+
+  if (!user) {
+    return null;
+  }
+
+  await db.delete(contentToSpace).where(eq(contentToSpace.contentId, id));
+
+  const [deleted] = await db
+    .delete(storedContent)
+    .where(and(eq(storedContent.user, user.id), eq(storedContent.id, id)))
+    .returning();
+
+  return deleted;
+}