Skip to content

Commit b0d6cc9

Browse files
author
Arbona Alapont
committed
Merge branch 'develop'
2 parents deace34 + d6b1f68 commit b0d6cc9

File tree

156 files changed

+7612
-655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+7612
-655
lines changed

Diff for: Ai-labar.postman_collection.json

+79-44
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,41 @@
11
{
22
"info": {
3-
"_postman_id": "c6dda908-a066-4cc6-8ea6-7fcee25d9d8b",
3+
"_postman_id": "f2047431-70b7-417b-b002-eb97ccacc7e9",
44
"name": "Ai-labar",
5-
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
5+
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
6+
"_exporter_id": "20903700"
67
},
78
"item": [
89
{
910
"name": "Users",
1011
"item": [
12+
{
13+
"name": "getPublicKey",
14+
"request": {
15+
"method": "GET",
16+
"header": [],
17+
"url": {
18+
"raw": "localhost:8080/users/getPublicKey",
19+
"host": [
20+
"localhost"
21+
],
22+
"port": "8080",
23+
"path": [
24+
"users",
25+
"getPublicKey"
26+
]
27+
}
28+
},
29+
"response": []
30+
},
1131
{
1232
"name": "login",
1333
"request": {
1434
"method": "POST",
1535
"header": [],
1636
"body": {
1737
"mode": "raw",
18-
"raw": "{\r\n \"user\": \"Beni\",\r\n \"password\": \"9b8769a4a742959a2d0298c36fb70623f2dfacda8436237df08d8dfd5b37374c\"\r\n}",
38+
"raw": "{\r\n \"user\": \"bgarciav\",\r\n \"password\": \"HuTao_06\"\r\n}",
1939
"options": {
2040
"raw": {
2141
"language": "json"
@@ -43,7 +63,7 @@
4363
"header": [],
4464
"body": {
4565
"mode": "raw",
46-
"raw": "{\r\n \"user\": \"a\",\r\n \"password\": \"9b8769a4a742959a2d0298c36fb70623f2dfacda8436237df08d8dfd5b37374c\",\r\n \"email\": \"a@test.com\"\r\n}",
66+
"raw": "{\r\n \"user\": \"Beni\",\r\n \"password\": \"9b8769a4a742959a2d0298c36fb70623f2dfacda8436237df08d8dfd5b37374c\",\r\n \"email\": \"beni@test.com\"\r\n}",
4767
"options": {
4868
"raw": {
4969
"language": "json"
@@ -78,7 +98,7 @@
7898
"header": [],
7999
"body": {
80100
"mode": "raw",
81-
"raw": "{\r\n \"user\": \"Beni\",\r\n \"password\": \"9b8769a4a742959a2d0298c36fb70623f2dfacda8436237df08d8dfd5b37374c\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\",\r\n \"newUser\": \"Beni2\"\r\n}",
101+
"raw": "{\r\n \"user\": \"Beni2\",\r\n \"password\": \"8185c8ac4656219f4aa5541915079f7b3743e1b5f48bacfcc3386af016b55320\",\r\n \"token\": \"e6fc130d97bc5f3ca7d414746a4df82bca185603ac02815d5a24aa563ee6c3eb\",\r\n \"newUser\": \"Beni3\"\r\n}",
82102
"options": {
83103
"raw": {
84104
"language": "json"
@@ -100,143 +120,158 @@
100120
"response": []
101121
},
102122
{
103-
"name": "editVisualization",
123+
"name": "deleteUser",
104124
"request": {
105-
"method": "PUT",
125+
"method": "DELETE",
106126
"header": [],
107127
"body": {
108128
"mode": "raw",
109-
"raw": "{\r\n \"user\": \"Beni\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\",\r\n \"visualization\": \"Cards\"\r\n}",
129+
"raw": "{\r\n \"user\": \"Beni\",\r\n \"token\": \"4f16e07c10f4a91f787daedb8a16bdfa1df688110841bf8ae8b0a3ac9afb7190\"\r\n}",
110130
"options": {
111131
"raw": {
112132
"language": "json"
113133
}
114134
}
115135
},
116136
"url": {
117-
"raw": "localhost:8080/users/editVisualization",
137+
"raw": "localhost:8080/users/deleteUser",
118138
"host": [
119139
"localhost"
120140
],
121141
"port": "8080",
122142
"path": [
123143
"users",
124-
"editVisualization"
144+
"deleteUser"
125145
]
126146
}
127147
},
128148
"response": []
129149
},
130150
{
131-
"name": "deleteUser",
151+
"name": "getUsersByMatch",
132152
"request": {
133-
"method": "DELETE",
153+
"method": "POST",
134154
"header": [],
135155
"body": {
136156
"mode": "raw",
137-
"raw": "{\r\n \"user\": \"Beni\",\r\n \"token\": \"4f16e07c10f4a91f787daedb8a16bdfa1df688110841bf8ae8b0a3ac9afb7190\"\r\n}",
157+
"raw": "{\r\n \"user\": \"Beni\",\r\n \"matcher\": \"\",\r\n \"token\": \"4f16e07c10f4a91f787daedb8a16bdfa1df688110841bf8ae8b0a3ac9afb7190\"\r\n}",
138158
"options": {
139159
"raw": {
140160
"language": "json"
141161
}
142162
}
143163
},
144164
"url": {
145-
"raw": "localhost:8080/users/deleteUser",
165+
"raw": "localhost:8080/users/getUsersByMatch",
146166
"host": [
147167
"localhost"
148168
],
149169
"port": "8080",
150170
"path": [
151171
"users",
152-
"deleteUser"
172+
"getUsersByMatch"
153173
]
154174
}
155175
},
156176
"response": []
157177
},
158178
{
159-
"name": "getUsersByMatch",
179+
"name": "getAllUsers",
160180
"request": {
161181
"method": "POST",
162182
"header": [],
163183
"body": {
164184
"mode": "raw",
165-
"raw": "{\r\n \"user\": \"Beni\",\r\n \"matcher\": \"\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\"\r\n}",
185+
"raw": "{\r\n \"user\": \"Beni\",\r\n \"token\": \"4f16e07c10f4a91f787daedb8a16bdfa1df688110841bf8ae8b0a3ac9afb7190\"\r\n}",
166186
"options": {
167187
"raw": {
168188
"language": "json"
169189
}
170190
}
171191
},
172192
"url": {
173-
"raw": "localhost:8080/users/getUsersByMatch",
193+
"raw": "localhost:8080/users/getAllUsers",
174194
"host": [
175195
"localhost"
176196
],
177197
"port": "8080",
178198
"path": [
179199
"users",
180-
"getUsersByMatch"
200+
"getAllUsers"
181201
]
182202
}
183203
},
184204
"response": []
185205
},
186206
{
187-
"name": "getAllUsers",
207+
"name": "getUsersDatabase",
208+
"protocolProfileBehavior": {
209+
"disableBodyPruning": true
210+
},
188211
"request": {
189-
"method": "POST",
212+
"auth": {
213+
"type": "basic",
214+
"basic": [
215+
{
216+
"key": "password",
217+
"value": "abcd1234",
218+
"type": "string"
219+
},
220+
{
221+
"key": "username",
222+
"value": "admin",
223+
"type": "string"
224+
}
225+
]
226+
},
227+
"method": "GET",
190228
"header": [],
191229
"body": {
192230
"mode": "raw",
193-
"raw": "{\r\n \"user\": \"Beni\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\"\r\n}",
231+
"raw": "{\r\n \"user\": \"Test1\",\r\n \"password\": \"532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25\"\r\n}",
194232
"options": {
195233
"raw": {
196234
"language": "json"
197235
}
198236
}
199237
},
200238
"url": {
201-
"raw": "localhost:8080/users/getAllUsers",
239+
"raw": "localhost:8080/users/getUsersDatabase",
202240
"host": [
203241
"localhost"
204242
],
205243
"port": "8080",
206244
"path": [
207245
"users",
208-
"getAllUsers"
246+
"getUsersDatabase"
209247
]
210248
}
211249
},
212250
"response": []
213251
},
214252
{
215-
"name": "getUsersDatabase",
216-
"protocolProfileBehavior": {
217-
"disableBodyPruning": true
218-
},
253+
"name": "logout",
219254
"request": {
220-
"method": "GET",
255+
"method": "POST",
221256
"header": [],
222257
"body": {
223258
"mode": "raw",
224-
"raw": "{\r\n \"user\": \"Test1\",\r\n \"password\": \"532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25\"\r\n}",
259+
"raw": "{\r\n \"user\": \"Test1\",\r\n \"token\": \"1fbbe39cab54bf182a9db3ae2fbc88cf97854857b6eaf0c1064e7f841a35e14f\"\r\n}",
225260
"options": {
226261
"raw": {
227262
"language": "json"
228263
}
229264
}
230265
},
231266
"url": {
232-
"raw": "localhost:8080/users/getUsersDatabase",
267+
"raw": "localhost:8080/users/logout",
233268
"host": [
234269
"localhost"
235270
],
236271
"port": "8080",
237272
"path": [
238273
"users",
239-
"getUsersDatabase"
274+
"logout"
240275
]
241276
}
242277
},
@@ -254,7 +289,7 @@
254289
"header": [],
255290
"body": {
256291
"mode": "raw",
257-
"raw": "{\r\n \"groupName\": \"Grupo Dos\",\r\n \"members\": [\r\n \"Luffy\",\r\n \"Yamato\",\r\n \"Zoro\",\r\n \"Lester\"\r\n ],\r\n \"user\": \"Beni\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\"\r\n}",
292+
"raw": "{\r\n \"groupName\": \"Grupo Uno\",\r\n \"members\": [\r\n \"Luffy\",\r\n \"Beni\",\r\n \"Admin\"\r\n ],\r\n \"user\": \"Beni\",\r\n \"token\": \"8c0407083600675eab58b450f25188a6a0652d52c25fa8f165158483c8a4707d\"\r\n}",
258293
"options": {
259294
"raw": {
260295
"language": "json"
@@ -282,7 +317,7 @@
282317
"header": [],
283318
"body": {
284319
"mode": "raw",
285-
"raw": "{\r\n \"groupName\": \"Grupo Uno\",\r\n \"user\": \"Beni\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\"\r\n}",
320+
"raw": "{\r\n \"groupName\": \"Grupo Uno\",\r\n \"user\": \"Beni\",\r\n \"token\": \"8c0407083600675eab58b450f25188a6a0652d52c25fa8f165158483c8a4707d\"\r\n}",
286321
"options": {
287322
"raw": {
288323
"language": "json"
@@ -310,7 +345,7 @@
310345
"header": [],
311346
"body": {
312347
"mode": "raw",
313-
"raw": "{\r\n \"id\": 1,\r\n \"groupName\": \"Grupo Uno\",\r\n \"members\": [\r\n \"Luffy\",\r\n \"Yamato\"\r\n ],\r\n \"user\": \"Beni\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\",\r\n \"newGroupName\": \"Grupo uno modificado\"\r\n}",
348+
"raw": "{\r\n \"id\": 1,\r\n \"groupName\": \"Grupo Uno\",\r\n \"members\": [\r\n \"Luffy\",\r\n \"Yamato\"\r\n ],\r\n \"user\": \"Beni\",\r\n \"token\": \"8c0407083600675eab58b450f25188a6a0652d52c25fa8f165158483c8a4707d\",\r\n \"newGroupName\": \"Grupo uno modificado\"\r\n}",
314349
"options": {
315350
"raw": {
316351
"language": "json"
@@ -338,7 +373,7 @@
338373
"header": [],
339374
"body": {
340375
"mode": "raw",
341-
"raw": "{\r\n \"user\": \"Beni\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\"\r\n}",
376+
"raw": "{\r\n \"user\": \"Beni\",\r\n \"token\": \"8c0407083600675eab58b450f25188a6a0652d52c25fa8f165158483c8a4707d\"\r\n}",
342377
"options": {
343378
"raw": {
344379
"language": "json"
@@ -366,7 +401,7 @@
366401
"header": [],
367402
"body": {
368403
"mode": "raw",
369-
"raw": "{\r\n \"groupName\": \"Grupo Dos\",\r\n \"user\": \"Beni\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\"\r\n}",
404+
"raw": "{\r\n \"id\":6,\r\n \"groupName\": \"Grupo Final\",\r\n \"user\": \"Beni\",\r\n \"token\": \"4f16e07c10f4a91f787daedb8a16bdfa1df688110841bf8ae8b0a3ac9afb7190\"\r\n}",
370405
"options": {
371406
"raw": {
372407
"language": "json"
@@ -418,7 +453,7 @@
418453
"header": [],
419454
"body": {
420455
"mode": "raw",
421-
"raw": "{\r\n \"user\": \"Beni\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\",\r\n \"elements\": 1,\r\n \"page\": 2\r\n}",
456+
"raw": "{\r\n \"user\": \"Beni\",\r\n \"token\": \"8c0407083600675eab58b450f25188a6a0652d52c25fa8f165158483c8a4707d\"\r\n}",
422457
"options": {
423458
"raw": {
424459
"language": "json"
@@ -474,7 +509,7 @@
474509
"header": [],
475510
"body": {
476511
"mode": "raw",
477-
"raw": "{\r\n \"id\": 2,\r\n \"title\": \"Mbappé\",\r\n \"type\": \"TEXT_SINGLE\",\r\n \"question\": \"¿Vendrá Mbappé?\",\r\n \"options\": [\r\n {\r\n \"option\": \"\"\r\n },\r\n {\r\n \"option\": \"No\"\r\n }\r\n ],\r\n \"user\": \"Yamato\",\r\n \"groupName\": \"Grupo Uno\",\r\n \"token\": \"bfbf787b1f540882ee03f3891bdeaabda30d5df717a184c6f10f5162f173d0c5\"\r\n}",
512+
"raw": "{\r\n \"id\": 6,\r\n \"title\": \"Prueba de opciones 3 editado\",\r\n \"type\": \"IMAGE_SINGLE\",\r\n \"question\": \"Se devolverá la foto almacenada en la imagen del usuario en Base64 siempre que exista el mismo y tenga una imagen guardada\",\r\n \"options\": [\r\n {\r\n \"image\": \"uno.jpg\",\r\n \"option\": \"Laila De Santos\"\r\n },\r\n {\r\n \"image\": \"dos.jpg\",\r\n \"option\": \"Tontucio Ramos\"\r\n },\r\n {\r\n \"image\": \"tres.jpg\",\r\n \"option\": \"La nueva opción\"\r\n }\r\n ],\r\n \"user\": \"Yamato\",\r\n \"groupName\": \"Grupo Tres\",\r\n \"closeDate\": \"19/07/2023\",\r\n \"token\": \"2ff6de4a3f425bac4a5bc9e36d286d48a0022fe5d58f0cf3b2d5accba648764f\"\r\n}",
478513
"options": {
479514
"raw": {
480515
"language": "json"
@@ -502,7 +537,7 @@
502537
"header": [],
503538
"body": {
504539
"mode": "raw",
505-
"raw": "{\r\n \"id\": 1,\r\n \"user\": \"Beni\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\"\r\n}",
540+
"raw": "{\r\n \"id\": 2,\r\n \"user\": \"Yamato\",\r\n \"token\": \"2ff6de4a3f425bac4a5bc9e36d286d48a0022fe5d58f0cf3b2d5accba648764f\"\r\n}",
506541
"options": {
507542
"raw": {
508543
"language": "json"
@@ -530,7 +565,7 @@
530565
"header": [],
531566
"body": {
532567
"mode": "raw",
533-
"raw": "{\r\n \"id\": 1,\r\n \"user\": \"Beni\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\"\r\n}",
568+
"raw": "{\r\n \"id\": 1,\r\n \"user\": \"Yamato\",\r\n \"token\": \"2ff6de4a3f425bac4a5bc9e36d286d48a0022fe5d58f0cf3b2d5accba648764f\"\r\n}",
534569
"options": {
535570
"raw": {
536571
"language": "json"
@@ -558,7 +593,7 @@
558593
"header": [],
559594
"body": {
560595
"mode": "raw",
561-
"raw": "{\r\n \"id\": 1,\r\n \"user\": \"Beni\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\"\r\n}",
596+
"raw": "{\r\n \"id\": 5,\r\n \"user\": \"Yamato\",\r\n \"token\": \"2ff6de4a3f425bac4a5bc9e36d286d48a0022fe5d58f0cf3b2d5accba648764f\"\r\n}",
562597
"options": {
563598
"raw": {
564599
"language": "json"
@@ -605,7 +640,7 @@
605640
"header": [],
606641
"body": {
607642
"mode": "raw",
608-
"raw": "{\r\n \"id\": 1,\r\n \"votation\": [\r\n \"Laila De Santos\"\r\n ],\r\n \"user\": \"Beni\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\"\r\n}",
643+
"raw": "{\r\n \"id\": 5,\r\n \"votation\": [\r\n \"Laila De Santo\"\r\n ],\r\n \"user\": \"Beni\",\r\n \"token\": \"8c0407083600675eab58b450f25188a6a0652d52c25fa8f165158483c8a4707d\"\r\n}",
609644
"options": {
610645
"raw": {
611646
"language": "json"
@@ -633,7 +668,7 @@
633668
"header": [],
634669
"body": {
635670
"mode": "raw",
636-
"raw": "{\r\n \"id\": 1,\r\n \"user\": \"Beni\",\r\n \"token\": \"762df6366fd13d4459f21cb272bc089a17886271d0e580d07184974367a2b459\"\r\n}",
671+
"raw": "{\r\n \"id\": 2,\r\n \"user\": \"Beni\",\r\n \"token\": \"8c0407083600675eab58b450f25188a6a0652d52c25fa8f165158483c8a4707d\"\r\n}",
637672
"options": {
638673
"raw": {
639674
"language": "json"

Diff for: Backend/ai-labar/SqliteDatabase.db

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)