Solution of week-10 and some small changes in test file

Author: Rajgupta36

week-10/1-postgres-simple/src/db/__tests__/db.test.ts

@@ -52,26 +52,45 @@ describe('Todo Operations', () => {
       const description = 'Test Description';
       const todo = await createTodo(userId, title, description);
 
-      expect(todo).toHaveProperty('id');
-      expect(todo.title).toEqual(title);
-      expect(todo.description).toEqual(description);
-      expect(todo.done).toEqual(false);
+      expect(todo?.id).toBeDefined();
+    expect(todo?.title).toEqual(title);
+    expect(todo?.description).toEqual(description);
+    expect(todo?.done).toEqual(false);
     });
 
-    test('updateTodo marks a todo as done', async () => {
-      // First, create a todo to update
-      const { id: todoId } = await createTodo(userId, 'Update Test', 'To be updated');
-  
-      const updatedTodo = await updateTodo(todoId);
-      expect(updatedTodo.done).toEqual(true);
-    });
+  test('updateTodo marks a todo as done', async () => {
+    // First, create a todo to update
+    const createdTodo = await createTodo(userId, 'Update Test', 'To be updated');
+
+    // Ensure createdTodo is defined before extracting its id
+    expect(createdTodo).toBeDefined();
+
+    // Extract id using optional chaining
+    const todoId = createdTodo?.id;
+
+    // Ensure todoId is not undefined
+    expect(todoId).toBeDefined();
+
+    if (todoId !== undefined) {
+        const updatedTodo = await updateTodo(todoId);
+
+        // Ensure updatedTodo is defined
+        expect(updatedTodo).toBeDefined();
+
+        // Use optional chaining for safer property access
+        expect(updatedTodo?.done).toEqual(true);
+    } else {
+        // Handle the case where todoId is undefined
+        fail('Failed to create todo for update');
+    }
+});
+
 
     test('getTodos retrieves all todos for a user', async () => {
       // Assuming there are already todos created in previous tests
       const todos = await getTodos(userId);
-  
-      expect(todos.length).toBeGreaterThan(0);
-      todos.forEach(todo => {
+   expect(todos?.length).toBeGreaterThan(0);
+      todos?.forEach(todo => {
         expect(todo).toHaveProperty('id');
         expect(todo.user_id).toEqual(userId);
       });

week-10/1-postgres-simple/src/db/todo.ts

@@ -1,41 +1,58 @@
+// todo.ts
+
 import { client } from "..";
-/*
- * Function should insert a new todo for this user
- * Should return a todo object
- * {
- *  title: string,
- *  description: string,
- *  done: boolean,
- *  id: number
- * }
- */
-export async function createTodo(userId: number, title: string, description: string) {
-    
+
+interface Todo {
+  id: number;
+  user_id: number;
+  title: string;
+  description: string;
+  done: boolean;
 }
-/*
- * mark done as true for this specific todo.
- * Should return a todo object
- * {
- *  title: string,
- *  description: string,
- *  done: boolean,
- *  id: number
- * }
- */
-export async function updateTodo(todoId: number) {
 
+// todo.ts
+
+
+export async function createTodo(userId: number, title: string, description: string){
+  try {
+   
+    const result = await client.query('INSERT INTO todos(user_id, title, description, done) VALUES ($1, $2, $3, $4) RETURNING *', [userId, title, description, false]);
+
+    if (result.rows.length > 0) {
+      return result.rows[0] as Todo|undefined;
+    } else {
+      console.error("Failed to create todo");
+      return undefined;
+    }
+  } catch (err) {
+    console.error(err);
+    
+  } 
 }
 
-/*
- *  Get all the todos of a given user
- * Should return an array of todos
- * [{
- *  title: string,
- *  description: string,
- *  done: boolean,
- *  id: number
- * }]
- */
-export async function getTodos(userId: number) {
 
+
+export async function updateTodo(todoId: number){
+  try {
+ const result = await client.query('UPDATE todos SET done = $1 WHERE id = $2 RETURNING *', [true, todoId]);
+
+    if (result.rows.length > 0) {
+      return result.rows[0] as Todo|undefined;
+    } else {
+      console.error("Failed to update todo");
+      return undefined;
+    }
+  } catch (err) {
+    console.error(err);
+  }
+}
+
+export async function getTodos(userId: number){
+  try {
+      
+      const result = await client.query('SELECT * FROM todos WHERE user_id = $1', [userId]);
+      return result.rows ;
+  } catch (err) {
+      console.error(err);
+  } 
 }

week-10/1-postgres-simple/src/db/user.ts

@@ -9,18 +9,29 @@ import { client } from "..";
  *   name: string
  * }
  */
-export async function createUser(username: string, password: string, name: string) {
-    
+interface User {
+    id: number;
+    username: string;
+    password: string;
+    name: string;
 }
 
-/*
- * Should return the User object
- * {
- *   username: string,
- *   password: string,
- *   name: string
- * }
- */
-export async function getUser(userId: number) {
-    
+
+
+export async function createUser(username: string, password: string, name: string){
+    try {
+        const result = await client.query('INSERT INTO users(username, password, name) VALUES($1, $2, $3) ', [username, password, name]);
+        return result.rows[0];
+    } catch (err) {
+        console.error(err);
+    }
 }
+
+export async function getUser(userId: number){
+    try {
+        const result = await client.query('SELECT * FROM users WHERE id = $1', [userId]);
+        return result.rows[0] as User;
+    } catch (err) {
+        console.error(err);
+    }
+}

week-10/2-prisma-simple/src/db/todo.ts

@@ -2,6 +2,14 @@ import { PrismaClient } from '@prisma/client';
 
 const prisma = new PrismaClient();
 
+interface todotype {
+    
+          title: string,
+          description: string,
+          done: boolean,
+          id: number
+         
+}
 /*
  * Function should insert a new todo for this user
  * Should return a todo object
@@ -13,7 +21,11 @@ const prisma = new PrismaClient();
  * }
  */
 export async function createTodo(userId: number, title: string, description: string) {
-    
+    const result = await prisma.todo.create({ data:{ userId:userId,title:title,description:description
+    }})
+
+    return result as todotype;
+ 
 }
 /*
  * mark done as true for this specific todo.
@@ -26,7 +38,16 @@ export async function createTodo(userId: number, title: string, description: str
  * }
  */
 export async function updateTodo(todoId: number) {
+      const result= await prisma.todo.update({
+        where:{
+            id:todoId
+        },
+            data:{
+               done:true    
+        }
+      })
 
+      return result as todotype;
 }
 
 /*
@@ -40,5 +61,10 @@ export async function updateTodo(todoId: number) {
  * }]
  */
 export async function getTodos(userId: number) {
-
+    const result = await prisma.todo.findMany({
+        where:{
+            userId:userId
+        }
+    })
+    return result ;
 }

week-10/2-prisma-simple/src/db/user.ts

@@ -12,8 +12,17 @@ const prisma = new PrismaClient();
  *   name: string
  * }
  */
-export async function createUser(username: string, password: string, name: string) {
+interface usertype {
 
+    username: string,
+      password: string,
+       name: string,
+       id:number
+   
+}
+export async function createUser(username: string, password: string, name: string) {
+    const res= await prisma.user.create({data:{username:username,password:password,name:name}});
+    return res as usertype;
 }
 
 /*
@@ -25,5 +34,6 @@ export async function createUser(username: string, password: string, name: strin
  * }
  */
 export async function getUser(userId: number) {
-    
+    const result=  await prisma.user.findFirst({ where:{id:userId}});
+    return result as usertype;
 }