Merge branch 'main' into lureus/feat-response-status

.prettierrc

@@ -1,6 +1,6 @@
 {
   "semi": false,
-  "singleQuote": true,
+  "singleQuote": false,
   "useTabs": false,
-  "tabWidth": 2
+  "tabWidth": 1
 }

eslint.config.js

@@ -1,3 +1,4 @@
+/* eslint-disable prettier/prettier */
 import globals from 'globals'
 import pluginJs from '@eslint/js'
 // import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'

package.json

@@ -20,6 +20,7 @@
   "swagger-ui-express": "^5.0.1",
   "zod": "^3.23.8"
  },
+
  "devDependencies": {
   "@eslint/js": "^9.14.0",
   "eslint": "^9.14.0",

src/database.js

@@ -1,3 +1,3 @@
-import { PrismaClient } from '@prisma/client'
+import { PrismaClient } from "@prisma/client"
 
 export const client = new PrismaClient()

src/docs/swagger.js

@@ -1,3 +1,4 @@
+
 import swaggerJSDoc from 'swagger-jsdoc'
 
 const swaggerDefinition = {

src/handler/auth/registering-new-user.js

@@ -2,6 +2,7 @@ import { registerSchema } from '../../schemas/auth/registerSchema.js'
 import { register } from '../../service/auth.js'
 import { responseStatus } from '../../utils/response.js'
 
+
 /**
  * @swagger
  * /api/v1/auth/register:
@@ -71,10 +72,10 @@ import { responseStatus } from '../../utils/response.js'
  * @param {import("express").NextFunction} next
  */
 export default async function registeringNewUser(req, res, next) {
-  try {
-    const data = registerSchema.parse(req.body)
+ try {
+  const data = registerSchema.parse(req.body)
 
-    await register(data)
+  await register(data)
 
     return res.json({
       status: responseStatus.OK,

src/handler/kamus/create-kamus-data.js

@@ -1,6 +1,7 @@
 import { createKamusOnDB } from '../../service/kamus.js'
 import { responseStatus } from '../../utils/response.js'
 
+
 /**
  * @swagger
  * /api/v1/kamus:
@@ -81,13 +82,14 @@ import { responseStatus } from '../../utils/response.js'
  * @param {import("express").NextFunction} next
  */
 export default async function createKamus(req, res, next) {
-  try {
-    /**
-     * @typedef CreateKamus
-     * @type {object}
-     * @property {string} word
-     * @property {string} wordDescription
-     */
+ try {
+  /**
+   * @typedef CreateKamus
+   * @type {object}
+   * @property {string} word
+   * @property {string} wordDescription
+   */
+
 
     /** @type {CreateKamus} */
     const { word, wordDescription } = req.body
@@ -99,11 +101,11 @@ export default async function createKamus(req, res, next) {
         message: 'word atau description tidak boleh kosong',
       })
     }
-
-    const kamus = await createKamusOnDB({
-      word,
-      wordDescription,
-    })
+   
+  const kamus = await createKamusOnDB({
+   word,
+   wordDescription,
+  })
 
     return res.status(201).json({
       status: responseStatus.CREATED,
@@ -113,4 +115,5 @@ export default async function createKamus(req, res, next) {
   } catch (error) {
     next(error)
   }
+
 }

src/handler/kamus/delete-kamus-data.js

@@ -1,6 +1,7 @@
 import { deleteKamusOnDB } from '../../service/kamus.js'
 import { responseStatus } from '../../utils/response.js'
 
+
 /**
  * @swagger
  * /api/v1/kamus/{id}:
@@ -53,19 +54,19 @@ import { responseStatus } from '../../utils/response.js'
  * @param {import("express").NextFunction} next
  */
 export default async function deleteKamus(req, res, next) {
-  try {
-    const { id } = req.params
-
-    // Delete Kamus entry
-    await deleteKamusOnDB(id)
+ try {
+  const { id } = req.params
 
+  // Delete Kamus entry
+  await deleteKamusOnDB(id)
     // Respond with success message
-    return res.status(200).json({
+  return res.status(200).json({
       status: responseStatus.DELETED,
       message: 'Kamus berhasil dihapus',
     })
   } catch (error) {
     // Handle errors
     next(error)
   }
+
 }

src/handler/kamus/find-kamus-by-id.js

@@ -2,6 +2,7 @@ import { findKamusById } from '../../service/kamus.js'
 import { Prisma } from '@prisma/client'
 import { responseStatus } from '../../utils/response.js'
 
+
 /**
  * @swagger
  * /api/v1/kamus/{id}:

src/handler/kamus/get-all-kamus-data.js

@@ -55,10 +55,10 @@ import { responseStatus } from '../../utils/response.js'
  * @returns
  */
 export default async function getAllKamusData(req, res, next) {
-  try {
-    const query = req.query.q
-    let kamusData
-
+ try {
+  const query = req.query.q
+  let kamusData
+  
     if (query) {
       kamusData = await findAllKamusDataBy(query)
     } else {
@@ -73,4 +73,13 @@ export default async function getAllKamusData(req, res, next) {
   } catch (error) {
     next(error)
   }
+
+  return res.json({
+   status: "OK",
+   data: kamusData,
+   message: "Data kamus berhasil diambil",
+  })
+ } catch (error) {
+  next(error)
+ }
 }

src/handler/kamus/update-kamus-data.js

@@ -97,10 +97,9 @@ import { responseStatus } from '../../utils/response.js'
  * @param {import("express").NextFunction} next
  */
 export default async function updateKamus(req, res, next) {
-  try {
-    const { id } = req.params
-    const { word, wordDescription } = req.body
-
+ try {
+  const { id } = req.params
+  const { word, wordDescription } = req.body
     // Validate request body
     if (!word || !wordDescription) {
       return res.status(400).json({
@@ -110,9 +109,9 @@ export default async function updateKamus(req, res, next) {
       })
     }
 
-    // Update Kamus entry
-    const updatedKamus = await updateKamusOnDB(id, { word, wordDescription })
 
+  // Update Kamus entry
+  const updatedKamus = await updateKamusOnDB(id, { word, wordDescription })
     // Respond with updated Kamus entry
     return res.status(200).json({
       status: responseStatus.OK,

src/index.js

@@ -1,3 +1,4 @@
+
 import express from 'express'
 import { kamusRoute } from './routes/kamus.js'
 import { cors } from './middleware/cors.js'
@@ -12,6 +13,7 @@ app.use(express.json())
 app.use(cors)
 
 app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerSpec))
+
 /**
  * TODO :
  * Untuk saat ini hanya endpoint berikut yang perlu dibuat
@@ -21,14 +23,15 @@ app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerSpec))
  *
  */
 
-app.use('/api/v1/kamus', kamusRoute)
+app.use("/api/v1/kamus", kamusRoute)
 
 /**
  * Buatin error handlingnya rek
  * middlewarenya buat di ./middleware
  * o iya sekalian buatin handling 404
  */
+
 app.use('*', pathNotFound)
 app.use(serverError)
 
-app.listen(PORT, '0.0.0.0', () => console.log(`Listening ${PORT}`))
+app.listen(PORT, "0.0.0.0", () => console.log(`Listening ${PORT}`))

src/middleware/verify-token.js

@@ -2,18 +2,18 @@ import * as jose from 'jose'
 import { responseStatus } from '../utils/response'
 
 export async function verifyToken(req, res, next) {
-  try {
-    const token = req.headers.authorization?.replace('Bearer ', '')
+ try {
+  const token = req.headers.authorization?.replace("Bearer ", "")
 
-    if (!token) {
+   if (!token) {
       return res.status(401).json({ status: responseStatus.UNAUTHORIZED })
-    }
+   }
 
-    // TODO: Check if token is blacklisted
+  // TODO: Check if token is blacklisted
 
-    const secret = new TextEncoder().encode(process.env.JWT_SECRET)
+  const secret = new TextEncoder().encode(process.env.JWT_SECRET)
 
-    const { payload } = await jose.jwtVerify(token, secret)
+  const { payload } = await jose.jwtVerify(token, secret)
 
     req.user = payload
     next()

src/routes/auth.js

@@ -1,8 +1,8 @@
-import { Router } from 'express'
-import authenticateSession from '../handler/auth/authenticate-session.js'
-import registeringNewUser from '../handler/auth/registering-new-user.js'
+import { Router } from "express"
+import authenticateSession from "../handler/auth/authenticate-session.js"
+import registeringNewUser from "../handler/auth/registering-new-user.js"
 
 export const authRoute = Router()
 
-authRoute.post('/login', authenticateSession)
-authRoute.post('/register', registeringNewUser)
+authRoute.post("/login", authenticateSession)
+authRoute.post("/register", registeringNewUser)

src/routes/kamus.js

@@ -8,13 +8,13 @@ import findKamusId from '../handler/kamus/find-kamus-by-id.js'
 export const kamusRoute = Router()
 
 // Route to get all Kamus data
-kamusRoute.get('/', getAllKamusData)
+kamusRoute.get("/", getAllKamusData)
 
 // Route to create a new Kamus entry
-kamusRoute.post('/', createKamus)
+kamusRoute.post("/", createKamus)
 
 // Route to update an existing Kamus entry
-kamusRoute.put('/:id', updateKamus)
+kamusRoute.put("/:id", updateKamus)
 
 // Route to delete an existing Kamus entry
 kamusRoute.delete('/:id', deleteKamus)

src/schemas/auth/loginSchema.js

@@ -1,9 +1,9 @@
-import { z } from 'zod'
+import { z } from "zod"
 
 /**
  * @typedef {z.infer<typeof loginSchema>} Login
  */
 export const loginSchema = z.object({
-  email: z.string().email('Email tidak valid'),
-  password: z.string('Password wajib di isi').trim(),
+ email: z.string().email("Email tidak valid"),
+ password: z.string("Password wajib di isi").trim(),
 })

src/schemas/auth/registerSchema.js

@@ -1,11 +1,11 @@
-import { z } from 'zod'
+import { z } from "zod"
 
 /**
  * @typedef {z.infer<typeof registerSchema>} Register
  */
 export const registerSchema = z.object({
-  email: z.string().email('Email tidak valid'),
-  username: z.string().trim().min(1),
-  fullname: z.string().trim().min(1),
-  password: z.string('Password wajib di isi').trim().min(1),
+ email: z.string().email("Email tidak valid"),
+ username: z.string().trim().min(1),
+ fullname: z.string().trim().min(1),
+ password: z.string("Password wajib di isi").trim().min(1),
 })