From 986aca393183b979e3c15f6c4a1c28adbed145e4 Mon Sep 17 00:00:00 2001
From: Filip Rojek <filip@filiprojek.cz>
Date: Wed, 15 May 2024 01:35:52 +0200
Subject: [PATCH] Fixed: review add - send add request to api

---
 api/src/controllers/reviewController.ts         |   1 +
 api/src/models/Review.ts                        |   8 ++++++++
 api/src/validators/reviewValidator.ts           |   1 +
 frontend/.gitignore                             |   1 +
 frontend/app/(app)/(tabs)/_layout.js            |   2 +-
 frontend/app/(app)/(tabs)/beer/index.js         |   2 +-
 frontend/app/(app)/(tabs)/review/.index.js.swp  | Bin 12288 -> 0 bytes
 .../(tabs)/review/{add.js => add/[beer_id].js}  |   9 +++++++--
 8 files changed, 20 insertions(+), 4 deletions(-)
 delete mode 100644 frontend/app/(app)/(tabs)/review/.index.js.swp
 rename frontend/app/(app)/(tabs)/review/{add.js => add/[beer_id].js} (97%)

diff --git a/api/src/controllers/reviewController.ts b/api/src/controllers/reviewController.ts
index 6104e23..8f8ec4b 100644
--- a/api/src/controllers/reviewController.ts
+++ b/api/src/controllers/reviewController.ts
@@ -18,6 +18,7 @@ new Docs(
 export async function add_post(req: Request, res: Response) {
 	try {
 		const data: IReview = req.body;
+		data.user_id = res.locals.user._id
 		const review = new Review(data);
 		await review.save();
 		res.status(201).json(Log.info(201, "review was added", review));
diff --git a/api/src/models/Review.ts b/api/src/models/Review.ts
index f9a4fcf..7c39149 100644
--- a/api/src/models/Review.ts
+++ b/api/src/models/Review.ts
@@ -28,6 +28,14 @@ const schema = new Schema<IReview | any>(
 			type: Boolean,
 			required: true,
 		},
+		beer_id: {
+			type: String,
+			required: true,
+		},
+		user_id: {
+			type: String,
+			required: true,
+		}
 	},
 	{
 		timestamps: true,
diff --git a/api/src/validators/reviewValidator.ts b/api/src/validators/reviewValidator.ts
index ae1799d..03fe14c 100644
--- a/api/src/validators/reviewValidator.ts
+++ b/api/src/validators/reviewValidator.ts
@@ -20,6 +20,7 @@ export const add = yup.object({
 	packaging: yup.number().min(1).max(5).required(),
 	sourness: yup.boolean().required(),
 	would_again: yup.boolean().required(),
+	user_id: yup.string().notRequired()
 });
 export interface IReview extends yup.InferType<typeof add>, mongooseAddition {}
 export const addExam: IReview = {
diff --git a/frontend/.gitignore b/frontend/.gitignore
index 50f5130..778538e 100644
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -37,3 +37,4 @@ yarn-error.*
 .env
 
 .vscode/
+*.swp
diff --git a/frontend/app/(app)/(tabs)/_layout.js b/frontend/app/(app)/(tabs)/_layout.js
index 8b8d7d7..57ff21b 100644
--- a/frontend/app/(app)/(tabs)/_layout.js
+++ b/frontend/app/(app)/(tabs)/_layout.js
@@ -67,7 +67,7 @@ export default function TabLayout() {
 					options={{ href: null, title: "Add beer" }}
 				/>
 				<Tabs.Screen
-					name="review/add"
+					name="review/add/[beer_id]"
 					options={{ href: null, title: "Add review" }}
 				/>
 			</Tabs>
diff --git a/frontend/app/(app)/(tabs)/beer/index.js b/frontend/app/(app)/(tabs)/beer/index.js
index 2977b1f..5349bcf 100644
--- a/frontend/app/(app)/(tabs)/beer/index.js
+++ b/frontend/app/(app)/(tabs)/beer/index.js
@@ -87,7 +87,7 @@ export default function Tab() {
 								title="Add review"
 								color={colors.gold}
 								onPress={() => {
-									router.push(`/review/${item._id}`);
+									router.push(`/review/add/${item._id}`);
 								}}
 							/>
 						</View>
diff --git a/frontend/app/(app)/(tabs)/review/.index.js.swp b/frontend/app/(app)/(tabs)/review/.index.js.swp
deleted file mode 100644
index b42827bc3c5bef7845e09d43459d4c122cf50626..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2&x;&I6vrz$h;3XIh2X(J*(TTnvpu_pfM#bFvzs-p>?Y&>h(cI4wcRzdz1!0@
zsjk_Xu^BxmUh+4H9*sBAix&wJA_yJ?#gl)7*C3*PtGee$)<tuT*1)H`tLpWu_r6ut
zu<YBJxw^bcU-4%Meoqn7`);w(I;qI*4++`l2T`K?|K+#J6yKYkUS+|85c|`0Dg0Oj
zEI$0&yT)Oq8L3J`RzlwFuyz}dB2hdEE4ty~QmS~0?WCoO#QeNliIR}_{Jr$BJKMGj
zSOp$bfsSfSzdW^h_N7^K)L(F)r_VgS`JiuGJF9?Iz$#!BunJfOtO8a6tAJJDKcIkW
zA0zJ}kK;uy%f<cJp?lG^H>-eEz$#!BunJfOtO8a6tAJI&Dqt0`3RndmLIqez$k&e&
z@|%O;@&Etf-~V@>B;;do0Nwznz;odDCkXiod;`7!pMhK8CU_s511@+3{5eI)FW@ft
z5_|+Q&;<&lAOe>_6`TQ6;NIhe{0P1W--5f~D{u?k1Y4j6PJw$T2>Ahg3i==h9BhM4
z@FutdE`!tHBsc+neT<Nw!5wfLd=5SVAAlR61wyb2=D>^KS#TWu0j;!NMze=-&27k5
z0jq#jz$#!BunPQN6&RG}h%+b?$7wOyjFJVRlxUr&?zuCr?rpO$jFRSgI(t?(cZ3YN
zTw`I>Nzpem?t3c=)h@cmJ&Ph15}ulp^|h}^aX8NIn{Gq2|2Eg_LPqbP8kEHtnl0k!
z=I-6unHdvUUKP3$rRpDDvN&oc%a|C^x&cRtsWfTrby5{I`irLM6fP#m8ZqzXi3B=|
zDB;K=BfQrZQc?7!il(X`^OV-;x_(&S<y`rJ<S2plGC~H#(Xu+#%2kxE&g03cn5$F5
zkp4}K=+*}Bsrfn!_8FD{VrN<_zdh_2R4c|Jf44Bd$eWV$p)KlY(K^y_L9!$q+U@AZ
zk!F`!Yve7#^ZiCuok^Z{Ez7g_b&!KRFNxA!F166L%*&`Ap@R~w%~Q_=z0dngJtbM7
zgoK42H>2xHB4N|^x1+F-$M_#jGhXUkypSnY%k<T>tFOgO>5V`pbRHBsOVPoS`;xa~
z7I4oURuf}ayJm?TM<jL0(-cveh_FBL3-sQtW#*RpO%aE=Llvo**W3$XNY_kVva8Lj
z3mu%A1dm6_G}=X4E6G(yCQt>(0QSZ!i@8*uyDnN>?LrRP#YUxFR75w6AoZpbG55KY
zLVCEG*atLVD%ho_Lmw>1Nx8ZRVLYvluP=F$`KHxvY+2T2k)p^M)zl*Katrev(1}YP
zV)lr|`ou&@5O+dujtssK2v1-qxtEqU@~+%3T#ei|I3n_{pU&D+1d!F|$$`K0cKynB
zeRE-Dd2#zfeR+FxZDlZAi6&Rq%O-dw`})q(eiG0|Cka#}5^5ZpoJttg9}jwM%fvh}
zg2UEH`BJ071Lcj@F^}$=PP<GCWwsD0OxKk@s>V@qu0!5nomh=0-e5cMgejwzIry1=
zFQ1}3azO_amFq3);_L^?of{kHTW2)>Y9QbyfwXDGZ11sczIh5ilXm&Q*ie51jxf{R
f+UUkGPJL9%6JMq>9UhTUI40cbgsJF&<K4di017We

diff --git a/frontend/app/(app)/(tabs)/review/add.js b/frontend/app/(app)/(tabs)/review/add/[beer_id].js
similarity index 97%
rename from frontend/app/(app)/(tabs)/review/add.js
rename to frontend/app/(app)/(tabs)/review/add/[beer_id].js
index 8ffde5c..dd6cef9 100644
--- a/frontend/app/(app)/(tabs)/review/add.js
+++ b/frontend/app/(app)/(tabs)/review/add/[beer_id].js
@@ -7,9 +7,11 @@ import * as ImagePicker from "expo-image-picker";
 import DropDownPicker from "react-native-dropdown-picker";
 const DropdownTheme = require("@components/DropdownTheme");
 import { Platform } from "react-native";
+import { useLocalSearchParams } from "expo-router";
 
 export default function reviewAdd() {
 	// States for each dropdown
+	const routeParams = useLocalSearchParams();
 	const [openFoam, setOpenFoam] = useState(false);
 	const [openBitterSweetness, setOpenBitterSweetness] = useState(false);
 	const [openTaste, setOpenTaste] = useState(false);
@@ -311,6 +313,7 @@ export default function reviewAdd() {
 			credentials: "include",
 			headers: { "Content-Type": "application/json" },
 			body: JSON.stringify({
+				beer_id: routeParams.beer_id,
 				foam: itemFoam,
 				bitter_sweetness: itemBitter_sweetness,
 				taste: itemTaste,
@@ -322,10 +325,12 @@ export default function reviewAdd() {
 		const res = await req.json();
 
 		if (res.code == 201 && res.data._id) {
-			window.location.href = `/review/${res.data._id}`;
+			// window.location.href = `/review/${res.data._id}`;
+			// TODO: use react router for redirect
+			alert("Review was added!");
 		} else {
 			alert(
-				"Beer was not added successfully. Please check your data and try again.",
+				"Review was not added successfully. Please check your data and try again.",
 			);
 		}
 	}