fixed postgres sql for admin user and language

rgerum · Dec 17, 2023 · df3d700 · df3d700
1 parent 877e85e
commit df3d700
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 24 deletions.
diff --git a/src/app/admin/courses/set/route.js b/src/app/admin/courses/set/route.js
@@ -27,6 +27,8 @@ async function set_course(data) {
   let id;
   let tag_list = data["tag_list"] || "";
   delete data["tag_list"];
+  console.log(data);
+
   if (data.id === undefined) {
     id = (await sql`INSERT INTO course ${sql(data)} RETURNING id`)[0].id;
   } else {

diff --git a/src/app/admin/languages/language_list.jsx b/src/app/admin/languages/language_list.jsx
@@ -111,7 +111,7 @@ export default function LanguageList({ users }) {
             obj={{
               name: "new language",
               short: "",
-              flag: "",
+              flag: 0,
               flag_file: "",
               speaker: "",
               rtl: 0,

diff --git a/src/app/admin/users/[user_id]/page.jsx b/src/app/admin/users/[user_id]/page.jsx
@@ -6,9 +6,9 @@ async function user_properties(id) {
   const isNumeric = (value) =>
     value.length !== 0 && [...value].every((c) => c >= "0" && c <= "9");
   if (isNumeric(id))
-    return (await sql`SELECT * FROM user WHERE id = ${id} LIMIT 1;`)[0];
+    return (await sql`SELECT * FROM "user" WHERE id = ${id} LIMIT 1;`)[0];
   else
-    return (await sql`SELECT * FROM user WHERE username = ${id} LIMIT 1;`)[0];
+    return (await sql`SELECT * FROM "user" WHERE username = ${id} LIMIT 1;`)[0];
 }
 
 export default async function Page({ params }) {

diff --git a/src/app/admin/users/set/activate/route.js b/src/app/admin/users/set/activate/route.js
@@ -24,5 +24,5 @@ export async function POST(req) {
 }
 
 async function set_user_activate({ id, activated }) {
-  return await sql`UPDATE "user" SET activated = ${activated} WHERE user.id = ${id};`;
+  return await sql`UPDATE "user" SET activated = ${activated} WHERE "user".id = ${id};`;
 }
diff --git a/src/app/admin/users/set/write/route.js b/src/app/admin/users/set/write/route.js
@@ -24,5 +24,5 @@ export async function POST(req) {
 }
 
 async function set_user_write({ id, write }) {
-  return await sql`UPDATE "user" SET role = {write} WHERE "user".id = {id};`;
+  return await sql`UPDATE "user" SET role = ${write} WHERE "user".id = ${id};`;
 }
diff --git a/src/app/editor/story/[story]/editor.jsx b/src/app/editor/story/[story]/editor.jsx
@@ -138,7 +138,7 @@ export default function Editor({ story_data, avatar_names, session }) {
       let data = {
         id: story_data.id,
         duo_id: story_data.duo_id,
-        name: story_meta.from_language_name,
+        name: story_meta.fromLanguageName,
         image: story_meta.icon,
         set_id: parseInt(story_meta.set_id),
         set_index: parseInt(story_meta.set_index),

diff --git a/src/app/editor/story/set_story/route.js b/src/app/editor/story/set_story/route.js
@@ -4,26 +4,22 @@ import { sql } from "lib/db";
 import { upload_github } from "lib/editor/upload_github";
 
 export async function POST(req) {
-  try {
-    const token = await getToken({ req });
+  const token = await getToken({ req });
 
-    if (!token?.role)
-      return new Response("You need to be a registered contributor.", {
-        status: 401,
-      });
-
-    let answer = await set_story(await req.json(), {
-      username: token.name,
-      user_id: token.id,
+  if (!token?.role)
+    return new Response("You need to be a registered contributor.", {
+      status: 401,
     });
 
-    if (answer === undefined)
-      return new Response("Error not found.", { status: 404 });
+  let answer = await set_story(await req.json(), {
+    username: token.name,
+    user_id: token.id,
+  });
 
-    return NextResponse.json(answer);
-  } catch (err) {
-    return new Response(err.message, { status: 500 });
-  }
+  if (answer === undefined)
+    return new Response("Error not found.", { status: 404 });
+
+  return NextResponse.json(answer);
 }
 
 async function set_story(data, { username, user_id }) {
@@ -38,7 +34,7 @@ async function set_story(data, { username, user_id }) {
     if (res.length) data["id"] = res[0]["id"];
   }
 
-  return sql`
+  await sql`
   UPDATE story SET ${sql(data, [
     "duo_id",
     "name",
@@ -50,7 +46,6 @@ async function set_story(data, { username, user_id }) {
     "course_id",
     "text",
     "json",
-    "api",
   ])}
   WHERE id = ${data.id}
 `;