refactor to deleteMyself

wasp-lang · Nov 17, 2023 · 23640bd · 23640bd
1 parent ef3be90
commit 23640bd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/wasp-ai/.prettierrc b/wasp-ai/.prettierrc
@@ -2,5 +2,5 @@
   "semi": true,
   "singleQuote": false,
   "trailingComma": "es5",
-  "printWidth": 120
+  "printWidth": 100
 }
diff --git a/wasp-ai/main.wasp b/wasp-ai/main.wasp
@@ -106,8 +106,8 @@ action createFeedback {
   entities: [Feedback]
 }
 
-action deleteUser {
-  fn: import { deleteUser } from "@server/operations.js",
+action deleteMyself {
+  fn: import { deleteMyself } from "@server/operations.js",
   entities: [User]
 }
 

diff --git a/wasp-ai/src/client/pages/ResultPage.jsx b/wasp-ai/src/client/pages/ResultPage.jsx
@@ -401,7 +401,7 @@ export function OnSuccessModal({ isOpen, setIsOpen, appGenerationResult }) {
         const num = parseFloat(match[1]);
         setNumTokensSpent(num * 1000);
       } else {
-        console.log('No match found');
+        console.log("Failed to parse total number of tokens used: no regex match.");
       }
     }
 

diff --git a/wasp-ai/src/client/pages/UserPage.jsx b/wasp-ai/src/client/pages/UserPage.jsx
@@ -15,7 +15,7 @@ import {
   projectStatusToDisplayableText,
 } from "../project/utils";
 import { HomeButton } from "../components/Header";
-import deleteUser from "@wasp/actions/deleteUser";
+import deleteMyself from "@wasp/actions/deleteMyself";
 import { MyDialog } from "../components/Dialog";
 
 export function UserPage({ user }) {
@@ -33,8 +33,7 @@ export function UserPage({ user }) {
       <DeleteUserModal
         isOpen={isDeleteUserModalOpen}
         setIsOpen={setIsDeleteUserModalOpen}
-        deleteUser={deleteUser}
-        user={user}
+        deleteUser={deleteMyself}
       />
 
       <div className="big-box">
@@ -137,9 +136,9 @@ function UserProjectsTable({ projects }) {
   );
 }
 
-function DeleteUserModal({ isOpen, setIsOpen, deleteUser, user }) {
+function DeleteUserModal({ isOpen, setIsOpen, deleteUser }) {
   async function deleteUserHandler() {
-    await deleteUser({ userId: user.id });
+    await deleteUser();
     logout();
   }
 

diff --git a/wasp-ai/src/server/operations.ts b/wasp-ai/src/server/operations.ts
@@ -1,4 +1,4 @@
-import { RegisterZipDownload, StartGeneratingNewApp, CreateFeedback, DeleteUser } from "@wasp/actions/types";
+import { RegisterZipDownload, StartGeneratingNewApp, CreateFeedback, DeleteMyself } from "@wasp/actions/types";
 import { GetAppGenerationResult, GetStats, GetFeedback, GetNumProjects, GetProjectsByUser } from "@wasp/queries/types";
 import HttpError from "@wasp/core/HttpError.js";
 import { checkPendingAppsJob } from "@wasp/jobs/checkPendingAppsJob.js";
@@ -238,14 +238,14 @@ export const getProjectsByUser: GetProjectsByUser<void, Project[]> = async (_arg
   });
 };
 
-export const deleteUser: DeleteUser<{ userId: number }, User> = async (args, context) => {
-  if (!context.user || context.user.id !== args.userId) {
+export const deleteMyself: DeleteMyself<void, User> = async (args, context) => {
+  if (!context.user) {
     throw new HttpError(401, "Not authorized");
   }
 
   return await context.entities.User.delete({
     where: {
-      id: args.userId,
+      id: context.user.id,
     },
   });
 };