🐛 Corrigindo os três bugs que ja haviam sido corrigidos, mas que se p…

…erderam

marktia-backend/src/main/java/ufes/marktiabackend/services/ServiceService.java

@@ -17,6 +17,7 @@
 import ufes.marktiabackend.filters.servicesfilter.ServicesFilterSpecification;
 import ufes.marktiabackend.repositories.ServiceRepository;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -96,6 +97,7 @@ public ServiceResponseDTO create(@Valid ServiceRequestDTO serviceRequestDTO) {
                         .description(serviceRequestDTO.getDescription())
                         .price(serviceRequestDTO.getPrice())
                         .picpayUser(serviceRequestDTO.getPicpayUser())
+                        .schedulings(new ArrayList<>())
                         .build();
 
         ufes.marktiabackend.entities.Service savedService = serviceRepository.save(service);

marktia-backend/src/main/java/ufes/marktiabackend/services/auth/AuthService.java

@@ -17,6 +17,8 @@
 import ufes.marktiabackend.repositories.UserRepository;
 import ufes.marktiabackend.services.FederationService;
 
+import java.util.Optional;
+
 @Service
 @RequiredArgsConstructor
 public class AuthService {
@@ -62,8 +64,11 @@ public AuthResponseDTO register(RegisterRequestDTO registerRequestDTO) {
     }
 
     public AuthResponseDTO authenticate(AuthRequestDTO authRequestDTO) {
-        User user = userRepository.findByEmail(authRequestDTO.getEmail())
-                .orElseThrow(() -> new EntityNotFoundException("Usuário com as credenciais fornecidas não encontrado."));
+        Optional<User> user = userRepository.findByEmail(authRequestDTO.getEmail());
+
+        if (user.isEmpty() || !passwordEncoder.matches(authRequestDTO.getPassword(), user.get().getPassword())) {
+            throw new EntityNotFoundException("Usuário com as credenciais fornecidas não encontrado.");
+        }
 
         try {
             authenticationManager.authenticate(
@@ -76,10 +81,10 @@ public AuthResponseDTO authenticate(AuthRequestDTO authRequestDTO) {
         }
 
         return AuthResponseDTO.builder()
-                .id(user.getId().toString())
-                .name(user.getName())
-                .userRole(user.getUserRole().getValue())
-                .token(jwtService.generateToken(user))
+                .id(user.get().getId().toString())
+                .name(user.get().getName())
+                .userRole(user.get().getUserRole().getValue())
+                .token(jwtService.generateToken(user.get()))
                 .build();
     }
 }

marktia-frontend/.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "typescript.tsdk": "node_modules\\typescript\\lib",
+  "typescript.enablePromptUseWorkspaceTsdk": true
+}

marktia-frontend/Dockerfile

@@ -0,0 +1,59 @@
+FROM node:18-alpine AS base
+
+# Install dependencies only when needed
+FROM base AS deps
+# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+
+# Install dependencies based on the preferred package manager
+COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
+RUN \
+  if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
+  elif [ -f package-lock.json ]; then npm ci; \
+  elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i --frozen-lockfile; \
+  else echo "Lockfile not found." && exit 1; \
+  fi
+
+
+# Rebuild the source code only when needed
+FROM base AS builder
+WORKDIR /app
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
+
+# Next.js collects completely anonymous telemetry data about general usage.
+# Learn more here: https://nextjs.org/telemetry
+# Uncomment the following line in case you want to disable telemetry during the build.
+# ENV NEXT_TELEMETRY_DISABLED 1
+
+RUN yarn build
+
+# If using npm comment out above and use below instead
+# RUN npm run build
+
+# Production image, copy all the files and run next
+FROM base AS runner
+WORKDIR /app
+
+ENV NODE_ENV production
+# Uncomment the following line in case you want to disable telemetry during runtime.
+# ENV NEXT_TELEMETRY_DISABLED 1
+
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+
+COPY --from=builder /app/public ./public
+
+# Automatically leverage output traces to reduce image size
+# https://nextjs.org/docs/advanced-features/output-file-tracing
+COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+
+USER nextjs
+
+EXPOSE 3000
+
+ENV PORT 3000
+
+CMD ["node", "server.js"]

marktia-frontend/components/common/service_details.tsx

@@ -12,7 +12,7 @@ type ServiceDetailsProps = {
 
 export default function ServiceDetails({ type, description, price, picpayUser }: ServiceDetailsProps) {
     return (
-        <div className="p-5">
+        <div>
             <div className="py-2"><span>Tipo: {type}</span></div>
             <div className="py-2"><span>Descrição: {description}</span></div>
             <div className="py-2"><span>Preço: <FormattedMoney money={price} /></span></div>

marktia-frontend/controllers/services.ts

@@ -36,7 +36,7 @@ const getURLParams = (servicesFilter: ServicesFilter) => {
 
     url += `providerId=${servicesFilter.providerId ? servicesFilter.providerId : ""}&`;
     url += `name=${servicesFilter.name ? servicesFilter.name : ""}&`;
-    url += `type=${servicesFilter.type ? servicesFilter.type : ""}&`;
+    url += `type=${(servicesFilter.type !== null) ? servicesFilter.type : ""}&`;
 
     url += `stateId=${servicesFilter.federation?.stateId ? servicesFilter.federation.stateId : ""}&`;
     url += `regionId=${servicesFilter.federation?.regionId ? servicesFilter.federation.regionId : ""}&`;