Merge branch 'main' of https://github.com/CtrI-Alt-Del/stocker

CtrI-Alt-Del · Nov 29, 2024 · 47b88bd · 47b88bd
2 parents 16d4d3a + 9bb6587
commit 47b88bd
Show file tree

Hide file tree

Showing 13 changed files with 166 additions and 17 deletions.
diff --git a/apps/server/src/api/controllers/locations/index.ts b/apps/server/src/api/controllers/locations/index.ts
@@ -1,2 +1,3 @@
 export { RegisterLocationController } from './register-location-controller'
-export { DeleteLocationsController } from './delete-locations-controller'
+export { DeleteLocationsController } from './delete-locations-controller'
+export { UpdateLocationController } from './update-location-controller'
diff --git a/apps/server/src/api/controllers/locations/list-locations-controller.ts b/apps/server/src/api/controllers/locations/list-locations-controller.ts
@@ -0,0 +1,22 @@
+import type { IHttp } from '@stocker/core/interfaces'
+import { ListLocationsUseCase } from '@stocker/core/use-cases'
+
+import { locationsRepository } from '@/database'
+import { HTTP_STATUS_CODE } from '@stocker/core/constants'
+
+type RouteParams = {
+  page: string
+}
+
+export class ListLocationsController {
+  async handle(http: IHttp) {
+    const { companyId } = await http.getUser()
+    const { page } = http.getQueryParams<RouteParams>()
+    const pageNumber = parseInt(page || '1', 10)
+
+    const useCase = new ListLocationsUseCase(locationsRepository)
+    const response = await useCase.execute({ page: pageNumber, companyId: companyId })
+
+    return http.send(response, HTTP_STATUS_CODE.ok)
+  }
+}
diff --git a/apps/server/src/api/controllers/locations/update-location-controller.ts b/apps/server/src/api/controllers/locations/update-location-controller.ts
@@ -0,0 +1,24 @@
+import type { LocationDto } from "@stocker/core/dtos";
+import type { IHttp } from "@stocker/core/interfaces";
+
+import { locationsRepository } from "@/database";
+import { UpdateLocationUseCase } from "@stocker/core/use-cases";
+import { HTTP_STATUS_CODE } from "@stocker/core/constants";
+import { User } from "@stocker/core/entities";
+
+type RouteParams = {
+    locationId: string                                                                                                                                                                                      
+  }
+
+export class UpdateLocationController {
+    async handle(http: IHttp) {
+        const { locationId } = http.getRouteParams<RouteParams>()
+        const {companyId} = await http.getUser()
+        const locationDto = http.getBody<Partial<LocationDto>>()
+
+        const useCase = new UpdateLocationUseCase(locationsRepository)
+        await useCase.execute({ locationId, locationDto, companyId })
+
+        return http.send(companyId, HTTP_STATUS_CODE.ok)
+    }
+}                                                                                                                                                                                                                                                                                                                                                                           
diff --git a/apps/server/src/app/fastify/routes/locations-routes.ts b/apps/server/src/app/fastify/routes/locations-routes.ts
@@ -1,10 +1,14 @@
 import { DeleteLocationsController, RegisterLocationController } from "@/api/controllers/locations";
 import type { FastifyInstance } from "fastify";
 import { FastifyHttp } from "../fastify-http";
+import { UpdateLocationController } from "@/api/controllers/locations/update-location-controller";
+import { ListLocationsController } from "@/api/controllers/locations/list-locations-controller";
 
 export const LocationsRoutes = async (app: FastifyInstance) => {
   const registerLocationController = new RegisterLocationController()
   const deleteLocationsController = new DeleteLocationsController()
+  const updateLocationController = new UpdateLocationController()
+  const listLocationsController = new ListLocationsController()
 
   app.post('/', async (request, response) => {
     const http = new FastifyHttp(request, response)
@@ -15,4 +19,14 @@ export const LocationsRoutes = async (app: FastifyInstance) => {
     const http = new FastifyHttp(request, response)
     return deleteLocationsController.handle(http)
   })
+
+  app.put('/:locationId', async (request, response) => {
+    const http = new FastifyHttp(request, response)
+    return updateLocationController.handle(http)
+  })
+
+  app.get('/', async (request, response) => {
+    const http = new FastifyHttp(request, response)
+    return listLocationsController.handle(http)
+  })
 }
diff --git a/apps/web/src/api/services/products-service.ts b/apps/web/src/api/services/products-service.ts
@@ -13,7 +13,9 @@ export const ProductsService = (apiClient: IApiClient): IProductsService => {
       return await apiClient.get<ProductDto>(`/products/${productId}`)
     },
 
-    async listProducts({ page }) {
+    async listProducts({ page,name,categoryId }) {
+      apiClient.setParam('categoryId',String(categoryId))
+      apiClient.setParam('name',String(name))
       apiClient.setParam('page', String(page))
       return await apiClient.get<PaginationResponse<ProductDto>>('/products')
     },

diff --git a/apps/web/src/ui/components/commons/category-select/index.tsx b/apps/web/src/ui/components/commons/category-select/index.tsx
@@ -10,10 +10,12 @@ type CategorySelectProps = {
   defeaultCategoryId?: string
   className?: string
   onSelectChange: (categoryId: string) => void
+  value?:string
 }
 
 export const CategorySelect = ({
   className,
+  value,
   defeaultCategoryId,
   onSelectChange,
 }: CategorySelectProps) => {
@@ -38,7 +40,7 @@ export const CategorySelect = ({
         size='2xl'
         trigger={
           <Select className={className}>
-            {selectedCategoryName ? selectedCategoryName : 'Selecione categoria'}
+            {value ? selectedCategoryName ? selectedCategoryName : 'Selecione categoria' : "Selecione categoria"}
           </Select>
         }
       >

diff --git a/...eb/src/ui/components/pages/locations/register-location-form/use-register-location-form.ts b/...eb/src/ui/components/pages/locations/register-location-form/use-register-location-form.ts
@@ -33,6 +33,7 @@ export function useRegisterLocationForm({
       companyId: companyId,
       subLocations: [],
     })
+    console.log(location)
     const response = await locationsService.registerLocation(location)
     if (response.isFailure) {
       showError(response.errorMessage)

diff --git a/apps/web/src/ui/components/pages/products/index.tsx b/apps/web/src/ui/components/pages/products/index.tsx
@@ -10,9 +10,13 @@ import { useProductsPage } from './use-products-page'
 import { Search } from '../../commons/search'
 import { AlertDialog } from '../../commons/alert-dialog'
 import { useAuthContext } from '../../contexts/auth-context'
+import { CategorySelect } from '../../commons/category-select'
+import { Icon } from '../../commons/icon'
 
 export const ProductsPage = () => {
   const {
+    categoryId,
+    handleCategoryIdSearchChange,
     isFetching,
     isDeleting,
     page,
@@ -32,13 +36,30 @@ export const ProductsPage = () => {
   const hasValidRole = user?.hasValidRole('manager')
   return (
     <>
-      <div className='flex flex-col gap-3 md:flex-row md:gap-0 justify-between'>
-        <div className='flex-1 w-full max-w-96 space-y-2'>
+      <div className='flex flex-col gap-3 md:flex-row md:gap-0 items-center  justify-between'>
+        <div className='flex-1 w-full  max-w-96 space-y-2 '>
           <h1 className='text-3xl font-black'>Produtos</h1>
-          <Search value={filterByNameValue} onSearchChange={handleSearchChange} />
+          <div className='flex flex-row gap-4 w-screen items-center '>
+            <Search value={filterByNameValue} onSearchChange={handleSearchChange} />
+            <div className=' flex flex-row items-center justify-center gap-4'>
+              <CategorySelect
+                value={categoryId}
+                onSelectChange={handleCategoryIdSearchChange}
+              />
+              {categoryId && (
+                <button
+                  type='button'
+                  onClick={() => handleCategoryIdSearchChange('')}
+                  className='flex justify-center items-center gap-2 text-sm text-gray-400'
+                >
+                  Remover Filtro
+                  <Icon name='close' className='size-4' />{' '}
+                </button>
+              )}
+            </div>
+          </div>
         </div>
-
-        <div className='flex items-center gap-1'>
+        <div className='flex items-center  gap-1'>
           {selectedProductsIds.length > 0 && (
             <AlertDialog
               trigger={

diff --git a/apps/web/src/ui/components/pages/products/use-products-page.ts b/apps/web/src/ui/components/pages/products/use-products-page.ts
@@ -15,12 +15,16 @@ export function useProductsPage() {
   const { showSuccess, showError } = useToast()
   const [selectedProductsIds, setSelectedProductsIds] = useState<string[]>([])
   const [page, setPage] = useUrlParamNumber('page', 1)
-  const [filterByNameValueState, setFilterByNameValue] = useUrlParamString('name')
+  const [filterByName, setFilterByNameValue] = useUrlParamString('name')
+  const [categoryId, setCategoryIdValue] = useUrlParamString('categoryId')
   const [isDeleting, setIsDeleting] = useState(false)
-  const filterByNameValue = filterByNameValueState ?? ''
 
   async function fetchProducts() {
-    const response = await productsService.listProducts({ page })
+    const response = await productsService.listProducts({
+      page,
+      name: filterByName,
+      categoryId,
+    })
 
     if (response.isFailure) {
       showError(response.errorMessage)
@@ -37,14 +41,15 @@ export function useProductsPage() {
   function handleSearchChange(value: string) {
     setFilterByNameValue(value ?? '')
   }
-
+  function handleCategoryIdSearchChange(categoryId: string) {
+    setCategoryIdValue(categoryId ?? '')
+  }
   const { data, isFetching, refetch } = useCache({
     fetcher: fetchProducts,
     key: CACHE.productsList.key,
-    dependencies: [page],
+    dependencies: [page, filterByName,categoryId],
   })
 
-
   const products = data ? data.items.map(Product.create) : []
   const itemsCount = data ? data.itemsCount : 0
 
@@ -78,8 +83,10 @@ export function useProductsPage() {
   }
 
   return {
+    categoryId,
+    handleCategoryIdSearchChange,
     page,
-    filterByNameValue,
+    filterByNameValue: filterByName,
     isFetching,
     isDeleting,
     products,

diff --git a/apps/web/src/ui/hooks/use-websocket.ts b/apps/web/src/ui/hooks/use-websocket.ts
@@ -14,7 +14,6 @@ export function useWebSocket({ url, onError, onResponse }: UseWebSocketProps) {
     (message: MessageEvent) => {
       if (!onResponse) return
       const response = RealtimeResponse.parseMessage(message.data)
-      console.log('useChatSocket', response)
 
       onResponse(response)
     },

diff --git a/packages/core/src/use-cases/locations/index.ts b/packages/core/src/use-cases/locations/index.ts
@@ -1,2 +1,4 @@
 export { RegisterLocationUseCase } from './register-location-use-case'
-export { DeleteLocationsUseCase } from './delete-locations-use-case'
+export { DeleteLocationsUseCase } from './delete-locations-use-case'
+export { UpdateLocationUseCase } from './update-location-use-case'
+export { ListLocationsUseCase } from './list-locations-use-case'
diff --git a/packages/core/src/use-cases/locations/list-locations-use-case.ts b/packages/core/src/use-cases/locations/list-locations-use-case.ts
@@ -0,0 +1,20 @@
+import type { ILocationsRepository } from '../../interfaces'
+import { PaginationResponse } from '../../responses'
+
+type Request = {
+  page: number
+  companyId: string
+}
+
+export class ListLocationsUseCase {
+  private readonly locationsRepository: ILocationsRepository
+
+  constructor(locationsRepository: ILocationsRepository) {
+    this.locationsRepository = locationsRepository
+  }
+
+  async execute({ page, companyId }: Request) {
+    const locations = await this.locationsRepository.findMany({ page, companyId })
+    return new PaginationResponse(locations)
+  }
+}
diff --git a/packages/core/src/use-cases/locations/update-location-use-case.ts b/packages/core/src/use-cases/locations/update-location-use-case.ts
@@ -0,0 +1,34 @@
+import { string } from "zod";
+import { Company } from "../../domain/entities";
+import type { LocationDto } from "../../dtos";
+import { ConflictError, NotFoundError } from "../../errors";
+import type { ILocationsRepository } from "../../interfaces";
+
+type Request = {
+    locationDto: Partial<LocationDto>
+    locationId: string
+    companyId: string
+  }
+
+export class UpdateLocationUseCase {
+    private readonly locationsRepository: ILocationsRepository
+
+    constructor(locationsRepository: ILocationsRepository) {
+        this.locationsRepository = locationsRepository
+    }
+    async execute({ locationDto, locationId, companyId }: Request) {
+        const location = await this.locationsRepository.findById(locationId)
+
+        if (!location) {
+            throw new NotFoundError('Localização não encontrada')
+          }
+        if (locationDto.name) {
+            const locationName = await this.locationsRepository.findByName(locationDto.name)
+            if (locationName !== null && locationName.dto.companyId === companyId) {
+                throw new ConflictError('Nome já em uso por outra localização no sistema')
+              }
+        }
+        const updatedLocation = location.update(locationDto)
+        await this.locationsRepository.update(updatedLocation, locationId)
+    }
+}