fixes

livepeer · Feb 27, 2024 · 8bb0cfa · 8bb0cfa
1 parent 09e50d1
commit 8bb0cfa
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/packages/api/src/controllers/asset.ts b/packages/api/src/controllers/asset.ts
@@ -635,8 +635,18 @@ const fieldsMap = {
 } as const;
 
 app.get("/", authorizer({}), async (req, res) => {
-  let { limit, cursor, all, allUsers, order, filters, count, cid, ...otherQs } =
-    toStringValues(req.query);
+  let {
+    limit,
+    cursor,
+    all,
+    allUsers,
+    order,
+    filters,
+    count,
+    cid,
+    projectId,
+    ...otherQs
+  } = toStringValues(req.query);
   const fieldFilters = _(otherQs)
     .pick("playbackId", "sourceUrl", "phase")
     .map((v, k) => ({ id: k, value: decodeURIComponent(v) }))
@@ -664,6 +674,14 @@ app.get("/", authorizer({}), async (req, res) => {
     query.push(sql`asset.data->>'deleted' IS NULL`);
   }
 
+  if (projectId) {
+    query.push(sql`asset.data->>'projectId' = ${projectId}`);
+  } else {
+    query.push(
+      sql`(asset.data->>'projectId' IS NULL OR asset.data->>'projectId' = '')`
+    );
+  }
+
   let output: WithID<Asset>[];
   let newCursor: string;
   if (req.user.admin && allUsers && allUsers !== "false") {

diff --git a/packages/api/src/controllers/project.ts b/packages/api/src/controllers/project.ts
@@ -141,7 +141,7 @@ app.post("/", authorizer({}), async (req, res) => {
   const id = uuid();
   await db.project.create({
     id: id,
-    name: "foo",
+    name: name,
     userId: req.user.id,
     createdAt: Date.now(),
   });

diff --git a/packages/api/src/schema/api-schema.yaml b/packages/api/src/schema/api-schema.yaml
@@ -1184,7 +1184,6 @@ components:
       additionalProperties: false
       required:
         - name
-        - projectId
       properties:
         name:
           type: string

diff --git a/packages/api/src/store/asset-table.ts b/packages/api/src/store/asset-table.ts
@@ -137,7 +137,7 @@ export default class AssetTable extends Table<WithID<Asset>> {
       query.push(sql`asset.data->>'projectId' = ${projectId}`);
     } else {
       query.push(
-        sql`(asset.data->>'projectId' IS NULL OR NOT asset.data ? 'projectId')`
+        sql`(asset.data->>'projectId' IS NULL OR  asset.data->>'projectId' = '')`
       );
     }
     console.log("XXX: HERE");