Merge pull request #139 from ES2-UFPI/refactoring

Alterando nomes das rotas
ES2-UFPI · Jul 10, 2021 · 58edaa5 · 58edaa5
2 parents 289fcda + 3ba1849
commit 58edaa5
Show file tree

Hide file tree

Showing 15 changed files with 144 additions and 47 deletions.
diff --git a/backend/src/controllers/EmotionalRecordController.ts b/backend/src/controllers/EmotionalRecordController.ts
@@ -6,11 +6,11 @@ class EmotionalReactionController {
 
     async index(request: Request, response: Response): Promise<Response> {
         try {
-            const { client_id } = request.params;
+            const { id } = request.params;
 
             const emotionalReactionService = new EmotionalReactionService();
 
-            const emotionalReactions = await emotionalReactionService.listByUser(client_id);
+            const emotionalReactions = await emotionalReactionService.listByUser(id);
 
             return response.json(emotionalReactions)
 
@@ -20,14 +20,28 @@ class EmotionalReactionController {
 
     }
 
+    async getById(request: Request, response: Response): Promise<Response> {
+        try {
+            const { id } = request.params;
+
+            const emotionalReactionService = new EmotionalReactionService();
+
+            const emotionalReaction = await emotionalReactionService.getById(id);
+
+            return response.status(200).json({ emotionalReaction });
+        } catch (err) {
+            return response.status(400).json({ erro: err })
+        }
+    }
+
 
     async destroy(request: Request, response: Response): Promise<Response> {
         try {
-            const { client_id, emotional_reaction_id } = request.params;
+            const { id } = request.params;
 
             const emotionalReactionService = new EmotionalReactionService();
 
-            await emotionalReactionService.delete(client_id, emotional_reaction_id);
+            await emotionalReactionService.delete(id);
 
             return response.json({ message: "Deletada com sucesso!" })
 
@@ -39,7 +53,7 @@ class EmotionalReactionController {
 
     async create(request: Request, response: Response): Promise<Response> {
         try {
-            const client_id = request.params['client_id'];
+            const client_id = request.params['id'];
 
             const emotionalReactionService = new EmotionalReactionService();
 
@@ -53,7 +67,7 @@ class EmotionalReactionController {
 
     async update(request: Request, response: Response): Promise<Response> {
         try {
-            const reaction_id = request.params['reaction_id'];
+            const reaction_id = request.params['id'];
 
             const body: EmotionalReaction = request.body;
 

diff --git a/backend/src/controllers/ProfessionalController.ts b/backend/src/controllers/ProfessionalController.ts
@@ -6,11 +6,11 @@ class ProfessionalController {
 
     async getClients(request: Request, response: Response) {
         try {
-            const { professional_id } = request.params;
+            const { id } = request.params;
 
             const professionalService = new ProfessionalService();
 
-            const clients = await professionalService.getClients(professional_id);
+            const clients = await professionalService.getClients(id);
 
             return response.status(200).json({clients});
         } catch(error) {

diff --git a/backend/src/controllers/UserController.ts b/backend/src/controllers/UserController.ts
@@ -5,10 +5,10 @@ class UserController {
 
     async getUserById(request: Request, response: Response) {
         try {
-            const { user_id } = request.params;
+            const { id } = request.params;
             const userService = new UserService();
 
-            const user = await userService.getUser(user_id);
+            const user = await userService.getUser(id);
 
             return response.status(200).json({ user });
         } catch (error) {

diff --git a/backend/src/database/migrations/1622341164120-CreateEmotionalReaction.ts b/backend/src/database/migrations/1622341164120-CreateEmotionalReaction.ts
@@ -22,7 +22,7 @@ export class CreateEmotionalReaction1622341164120 implements MigrationInterface
                     generationStrategy: 'uuid'
 
                 },
-                {name:"title",type:"varchar",length:'150',default:"'(Sem nome)'"},
+                {name:"title",type:"varchar",length:'150',default:"''"},
 
                 {name:"emotions",type:"varchar",length:'200',default:"''"},
 

diff --git a/backend/src/routes.ts b/backend/src/routes.ts
@@ -11,24 +11,22 @@ const professionalController = new ProfessionalController();
 const clientController = new ClientController();
 const userController = new UserController();
 
-
 routes.post("/professionals",professionalController.create);
-routes.post("/professionals/update",professionalController.update);
-routes.get("/professionals/clients/:professional_id", professionalController.getClients);
+routes.put("/professionals",professionalController.update);
+routes.get("/professionals/:id/clients", professionalController.getClients);
 
 routes.post("/clients", clientController.create);
-routes.post("/clients/update", clientController.update);
-
-routes.get("/reactions/:client_id", emotionalReactionController.index);
-
-routes.delete("/reactions/:client_id/:emotional_reaction_id", emotionalReactionController.destroy);
+routes.put("/clients", clientController.update);
+routes.get("/clients/:id/reactions", emotionalReactionController.index);
+routes.post("/clients/:id/reactions", emotionalReactionController.create);
 
-routes.post("/reactions/create/:client_id", emotionalReactionController.create);
+routes.get("/reactions/:id", emotionalReactionController.getById);
+routes.put("/reactions/:id", emotionalReactionController.update);
+routes.delete("/reactions/:id", emotionalReactionController.destroy);
 
-routes.post("/reactions/update/:reaction_id", emotionalReactionController.update);
+routes.post("/users/authentication", userController.login);
+routes.get("/users/:id", userController.getUserById);
 
-routes.get("/users/:user_id", userController.getUserById);
 
-routes.get("/user/login", userController.login);
 
 export { routes }
diff --git a/backend/src/services/EmotionalReactionService.ts b/backend/src/services/EmotionalReactionService.ts
@@ -16,10 +16,16 @@ class EmotionalReactionService {
         return emotionalReactions;
     }
 
+    async getById(id: string): Promise<EmotionalReaction> {
+        const emotionalReaction = await this.emotionalReactionRepository.findOne(id);
 
-    async delete(client_id: string, emotional_reaction_id: string) {
+        return emotionalReaction;
+    }
+
+
+    async delete(emotional_reaction_id: string) {
 
-        await this.emotionalReactionRepository.delete({ client_id, id: emotional_reaction_id });
+        await this.emotionalReactionRepository.delete({ id: emotional_reaction_id });
     }
 
     async create(client_id: string): Promise<string> {

diff --git a/frontend/package.json b/frontend/package.json
@@ -34,6 +34,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.9.0",
+    "@types/jsonwebtoken": "^8.5.4",
     "@types/react": "~16.9.35",
     "@types/react-native": "~0.63.2",
     "@types/react-native-vector-icons": "^6.4.6",

diff --git a/frontend/src/views/ClientList/index.tsx b/frontend/src/views/ClientList/index.tsx
@@ -21,7 +21,7 @@ const ClientList = (props: any) => {
         try {
             setLoading(true);
 
-            const response = await api.get(`/professionals/clients/${professional_id}`);
+            const response = await api.get(`professionals/${professional_id}/clients`);
             setClients(response.data.clients);
             console.log(response)
             setLoading(false);

diff --git a/frontend/src/views/RecordsList/index.tsx b/frontend/src/views/RecordsList/index.tsx
@@ -4,6 +4,7 @@ import Alert2Options from '../../components/Alert2Options';
 import Record_card from '../../components/Record_card';
 import { Title,Container,NothingFound,ContainerAll,TextNothingFound } from './styles';
 import api from '../../services/api'
+import { useNavigation } from '@react-navigation/native';
 
 interface Record{
     id:string;
@@ -25,7 +26,7 @@ export default function RecordsList() {
 
         try {
             setLoading(true)
-            const reaponse = await api.get(`/reactions/${client_id}`);
+            const reaponse = await api.get(`/clients/${client_id}/reactions`);
 
            const data = reaponse.data as [any];
 
@@ -69,7 +70,7 @@ export default function RecordsList() {
 
     async function handleDelete(){
 
-        await api.delete(`/reactions/${client_id}/${idCurrent}`)
+        await api.delete(`/reactions/${idCurrent}`)
         .then(()=>{
             const filteredRecord = records?.filter((record) => record.id != idCurrent );
             setRecords(filteredRecord);
@@ -79,13 +80,15 @@ export default function RecordsList() {
 
     }
 
+    const navigate = useNavigation();
+
     function onPressDelete(id:string){
         setIdCurrent(id);
         setModalIsVisible(true);
     }
 
-    function onPressCard(){
-
+    function onPressCard(id: string){
+        navigate.navigate('Registration', { id })
     }
 
     return (
@@ -112,7 +115,7 @@ export default function RecordsList() {
                     date={item.date} 
                     completed={item.completed} 
                     onPressDelete={onPressDelete} 
-                    onPress={onPressCard}
+                    onPress={() => onPressCard(item.id)}
                 />}
              horizontal={false}
              contentContainerStyle={{

diff --git a/frontend/src/views/Registration/index.tsx b/frontend/src/views/Registration/index.tsx
@@ -7,11 +7,11 @@ import StepThree from './views/StepThree';
 
 const StackSettings = createStackNavigator<RoutesList>();
 
-export default function Registration() {
+export default function Registration(props: any) {
     return (
 
         <StackSettings.Navigator screenOptions={{ headerShown: false }}>
-            <StackSettings.Screen name="StepZero" component={StepZero} />
+            <StackSettings.Screen name="StepZero" component={StepZero} initialParams={props.route.params} />
             <StackSettings.Screen name="StepOne" component={StepOne} />
             <StackSettings.Screen name="StepTwo" component={StepTwo} />
             <StackSettings.Screen name="StepThree" component={StepThree} />

diff --git a/frontend/src/views/Registration/views/StepOne/CheckBoxGroup/index.tsx b/frontend/src/views/Registration/views/StepOne/CheckBoxGroup/index.tsx
@@ -23,8 +23,26 @@ const CheckBoxGroup = forwardRef((props: any, ref: any) => {
         return arr.join(',');
     }
 
+    const setReceivedValues = (values: string) => {
+        const arr = values.split(',');
+        const newArr: boolean[] = new Array(sentimentos.length).fill(false);
+
+        arr.map((value: string) => {
+            for (const sentimento of sentimentos) {
+                if(value === sentimento.name) {
+                    newArr[sentimento.id] = true;
+                    break;
+                }
+            }
+        })
+
+        setValues(newArr);
+
+    }
+
     useImperativeHandle(ref, () => ({
         getValues: () => makeArrayOfTrueValues(),
+        setValues: (values: string) => setReceivedValues(values)
     }))
 
     const onChangeCheckBoxValue = (newValue: boolean, index: number) => {

diff --git a/frontend/src/views/Registration/views/StepOne/index.tsx b/frontend/src/views/Registration/views/StepOne/index.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, useState } from 'react';
+import React, { useRef, useState, useEffect } from 'react';
 import {
     Container,
     ScrollView,
@@ -32,6 +32,21 @@ const RegistrationStepZero = (props: any) => {
 
     const checkboxGroupRef = useRef<any>();
 
+    const loadEmotionalReaction = async () => {
+        try {
+            const response = await api.get(`reactions/${id}`);
+            const emotionalReaction: EmotionalReaction  = response?.data['emotionalReaction'];
+            setFormInput({ ...formInput, ...emotionalReaction });
+            checkboxGroupRef.current.setValues(emotionalReaction.emotions);
+        } catch (error) {
+            console.log(error);
+        }
+    }
+
+    useEffect(() => {
+        loadEmotionalReaction();
+    }, []);
+
     const getEmotions = (): string => {
         return checkboxGroupRef?.current?.getValues() || '';
     }
@@ -40,10 +55,14 @@ const RegistrationStepZero = (props: any) => {
 
         const emotions = getEmotions();
 
-        const data = { ...formInput, emotions };
+        let data: EmotionalReaction = { ...formInput, emotions };
+
+        if(formInput?.title?.length === 0) {
+            data = {...formInput, title: '(Sem nome)'};
+        }
 
-        api.post(`reactions/update/${id}`, data)
-            .then((res: AxiosResponse) => { console.log(res.data.message); navigateToNextStep() })
+        api.put(`reactions/${id}`, data)
+            .then((res: AxiosResponse) => navigateToNextStep() )
             .catch((err: AxiosError) => console.log(err.message));
     }
 

diff --git a/frontend/src/views/Registration/views/StepThree/index.tsx b/frontend/src/views/Registration/views/StepThree/index.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, useState } from 'react';
+import React, { useRef, useState, useEffect } from 'react';
 import {
     Container,
     ScrollView,
@@ -25,9 +25,23 @@ const RegistrationStepThree = (props: any) => {
 
     const [formInput, setFormInput] = useState<EmotionalReaction>();
 
+    const loadEmotionalReaction = async () => {
+        try {
+            const response = await api.get(`reactions/${id}`);
+            const emotionalReaction: EmotionalReaction  = response?.data['emotionalReaction'];
+            setFormInput({ ...formInput, ...emotionalReaction });
+        } catch (error) {
+            console.log(error);
+        }
+    }
+
+    useEffect(() => {
+        loadEmotionalReaction();
+    }, []);
+
     const handleConfirmation = () => {
-        api.post(`reactions/update/${id}`, formInput) 
-            .then((res: AxiosResponse) => {console.log(res.data.message); navigateToHome()})
+        api.put(`reactions/${id}`, formInput) 
+            .then((res: AxiosResponse) => navigateToHome())
             .catch((err: AxiosError) => console.log(err.message));
     }
 

diff --git a/frontend/src/views/Registration/views/StepTwo/index.tsx b/frontend/src/views/Registration/views/StepTwo/index.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, useState } from 'react';
+import React, { useRef, useState, useEffect } from 'react';
 import {
     Container,
     ScrollView,
@@ -25,9 +25,23 @@ const RegistrationStepTwo = (props: any) => {
 
     const [formInput, setFormInput] = useState<EmotionalReaction>();
 
+    const loadEmotionalReaction = async () => {
+        try {
+            const response = await api.get(`reactions/${id}`);
+            const emotionalReaction: EmotionalReaction  = response?.data['emotionalReaction'];
+            setFormInput({ ...formInput, ...emotionalReaction });
+        } catch (error) {
+            console.log(error);
+        }
+    }
+
+    useEffect(() => {
+        loadEmotionalReaction();
+    }, []);
+
     const handleConfirmation = () => {
-        api.post(`reactions/update/${id}`, formInput) 
-            .then((res: AxiosResponse) => {console.log(res.data.message); navigateToNextStep()})
+        api.put(`reactions/${id}`, formInput) 
+            .then((res: AxiosResponse) => navigateToNextStep())
             .catch((err: AxiosError) => console.log(err.message));
     }