accommodation rating system #165

cstns · 2022-03-05T01:13:19Z

Requirements for making a pull request

Thank you for contributing to our project!

Please fill out the template below to help the project maintainers review it as fast as possible and include your contribution to the project.

What does it fix?

Closes #151

Please mention the main changes this PR brings.

How has it been tested?

Please describe the tests that you ran to verify your changes.

- added newer version & css of jquery plugin - added am accommodation calculated rating property - displayed rating on the accommodation & for reviews

cstns · 2022-03-06T00:34:22Z

should be ok for review

app/Http/Controllers/Refugee/ProfileController.php

app/Accommodation.php

beniamin · 2022-03-07T21:57:45Z

Din ce inteleg, intr-un loc de cazare pot sta mai multi refugiati. Asta inseamna ca in pagina spatiului de cazare, un host ar trebui sa poata alege carui refugiat sa ii lase review-ul.

…on_rating_system

beniamin · 2022-03-07T22:18:39Z

sistemul de rating ar trebui sa fie in ambele directii: atat refugiatul sa poata da review unei cazari cat si gazda sa poata da review unui refugiat.

Propun ca in acest PR sa rezolvam doar parte de review de la un refugiat pentru o cazare, iar review-ul in cealalta directie sa il facem intr-un PR separat.

beniamin · 2022-03-07T22:21:08Z

Box-ul de review pentru o cazare apare atat pentru refugiat cat si pentru gazda, dar bat ambele in acelasi endpoint de review al refugiatului pentru cazare. Ar trebui ca box-ul sa nu apara host-ului.

cstns · 2022-03-07T22:30:34Z

Box-ul de review pentru o cazare apare atat pentru refugiat cat si pentru gazda, dar bat ambele in acelasi endpoint de review al refugiatului pentru cazare. Ar trebui ca box-ul sa nu apara host-ului.

uu nice catch, fixez acum

beniamin · 2022-03-07T22:36:27Z

Pare ca rating-ul nu se seteaza corect. Oricat stelute as selecta, valoarea trimisa in backend este tot 0.

Poti adauga ceva erori mai user friendly pentru validarile de pe campuriel de review? ai aici cateva detalii: https://laravel.com/docs/7.x/validation#customizing-the-error-messages

cstns · 2022-03-07T23:25:47Z

Pare ca rating-ul nu se seteaza corect. Oricat stelute as selecta, valoarea trimisa in backend este tot 0.

Poti adauga ceva erori mai user friendly pentru validarile de pe campuriel de review? ai aici cateva detalii: https://laravel.com/docs/7.x/validation#customizing-the-error-messages

Done 👍

Despre validari, picau ca nu se updata hidden input dupa upgrade-ul de jquery lib, mesajele de eroare erau cele default. Am avut intentia sa le modific dar am vazut ca existau deja traduceri pentru ele asa ca le-am lasat asa.

…view listing a little bit more condensed

beniamin · 2022-03-09T08:08:04Z

am deschis un PR in branch-ul tau cu niste modificari.

every allocated refugee may write a review for same location; make re…

cstns · 2022-03-09T16:18:52Z

L-am acceptat, ti-am dat access pe fork-ul meu

beniamin · 2022-03-07T19:53:17Z

app/Http/Controllers/Refugee/ProfileController.php

@@ -74,4 +77,15 @@ public function viewAccommodation(Accommodation $accommodation)
            ->with('otherFacilities', $otherFacilities)
            ->with('availabilityIntervals', $availabilityIntervals);
    }
+
+    public function reviewAccommodation(AccommodationReviewRequest $request, Accommodation $accommodation): View


aici ar fi bine sa faci un double check ca userul curent chiar a fost alocat (probabil si ca a fost cazat la locatia) unde lasa review.

sounds like a good idea

andreiio

We're mostly there. Mai rămân de rezolvat înainte să facem merge:

câteva todo comments prin cod;
o sugestie de extra checks de la @beniamin;
the merge conflict

andreiio · 2022-03-17T19:15:58Z

app/Accommodation.php

+    public function reviewedByUser(User $user): bool
+    {
+        return (bool)$this->reviews()->where(['user_id' => $user->id])->count();
+    }


Suggested change

public function reviewedByUser(User $user): bool

{

return (bool)$this->reviews()->where(['user_id' => $user->id])->count();

}

public function isReviewedBy(User $user): bool

{

return $this->reviews()->where('user_id', $user->id)->exists();

}

andreiio · 2022-03-17T19:16:32Z

resources/views/common/accommodation/view-accommodation.blade.php

+                </h6>
+            </div>
+
+            @if ($accommodation->reviewedByUser(auth()->user()))


Suggested change

@if ($accommodation->reviewedByUser(auth()->user()))

@if ($accommodation->isReviewedBy(auth()->user()))

andreiio · 2022-03-17T19:19:17Z

app/Http/Controllers/Refugee/ProfileController.php

@@ -74,4 +77,15 @@ public function viewAccommodation(Accommodation $accommodation)
            ->with('otherFacilities', $otherFacilities)
            ->with('availabilityIntervals', $availabilityIntervals);
    }
+
+    public function reviewAccommodation(AccommodationReviewRequest $request, Accommodation $accommodation): View


sounds like a good idea

andreiio · 2022-03-17T19:26:48Z

app/Accommodation.php

+        if ($count = $this->reviews()->count()) {
+            return $this->reviews()->sum('rating') / $count;
+        }
+
+        return 0;


aici putem avea un query în loc de două

Suggested change

if ($count = $this->reviews()->count()) {

return $this->reviews()->sum('rating') / $count;

}

return 0;

return $this->reviews()->avg('rating') ?? 0;

andreiio · 2022-03-17T19:28:51Z

app/Http/Requests/Refugee/AccommodationReviewRequest.php

+     */
+    public function authorize(): bool
+    {
+        return Auth::user()->isRefugee();


Suggested change

return Auth::user()->isRefugee();

return $this->user()->isRefugee();

cstns added 2 commits March 5, 2022 03:12

WIP accommodation rating system

b7258b1

change reviex text

2875cb2

andreiio marked this pull request as draft March 5, 2022 13:01

final touches rating system

edf4f2c

- added newer version & css of jquery plugin - added am accommodation calculated rating property - displayed rating on the accommodation & for reviews

cstns marked this pull request as ready for review March 6, 2022 00:33

cstns changed the title ~~WIP accommodation rating system~~ accommodation rating system Mar 6, 2022

beniamin reviewed Mar 7, 2022

View reviewed changes

app/Http/Controllers/Refugee/ProfileController.php Show resolved Hide resolved

app/Accommodation.php Show resolved Hide resolved

cstns added 4 commits March 8, 2022 00:00

add a flash message when completing a review

7ea039c

add star-rating styles to the refugee view accommodation blade

5bb9371

Merge remote-tracking branch 'origin/development' into add_accomodati…

a302eba

…on_rating_system

revert package.lock

cabaa53

cstns mentioned this pull request Mar 7, 2022

[Must Have] Implement review option #151

Open

cstns added 2 commits March 8, 2022 00:36

restrict the review section to refugees only

dc601df

fix rating input not responding on change events after version upgrade

b38dec5

gheorghelupu17 and others added 2 commits March 8, 2022 22:54

Merge branch 'development' into add_accomodation_rating_system

09e7c73

every allocated refugee may write a review for same location; make re…

55cc465

…view listing a little bit more condensed

Merge pull request #1 from beniamin/add_accomodation_rating_system

69349e7

every allocated refugee may write a review for same location; make re…

beniamin approved these changes Mar 9, 2022

View reviewed changes

andreiio changed the base branch from development to main March 12, 2022 10:44

andreiio requested changes Mar 17, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

accommodation rating system #165

accommodation rating system #165

cstns commented Mar 5, 2022

cstns commented Mar 6, 2022

beniamin commented Mar 7, 2022

beniamin commented Mar 7, 2022

beniamin commented Mar 7, 2022

cstns commented Mar 7, 2022

beniamin commented Mar 7, 2022 •

edited

Loading

cstns commented Mar 7, 2022 •

edited

Loading

beniamin commented Mar 9, 2022

cstns commented Mar 9, 2022

beniamin Mar 7, 2022

andreiio Mar 17, 2022

andreiio left a comment •

edited

Loading

andreiio Mar 17, 2022

andreiio Mar 17, 2022

andreiio Mar 17, 2022

andreiio Mar 17, 2022

andreiio Mar 17, 2022

	@if ($accommodation->reviewedByUser(auth()->user()))
	@if ($accommodation->isReviewedBy(auth()->user()))

	return Auth::user()->isRefugee();
	return $this->user()->isRefugee();

accommodation rating system #165

Are you sure you want to change the base?

accommodation rating system #165

Conversation

cstns commented Mar 5, 2022

Requirements for making a pull request

What does it fix?

How has it been tested?

cstns commented Mar 6, 2022

beniamin commented Mar 7, 2022

beniamin commented Mar 7, 2022

beniamin commented Mar 7, 2022

cstns commented Mar 7, 2022

beniamin commented Mar 7, 2022 • edited Loading

cstns commented Mar 7, 2022 • edited Loading

beniamin commented Mar 9, 2022

cstns commented Mar 9, 2022

beniamin Mar 7, 2022

Choose a reason for hiding this comment

andreiio Mar 17, 2022

Choose a reason for hiding this comment

andreiio left a comment • edited Loading

Choose a reason for hiding this comment

andreiio Mar 17, 2022

Choose a reason for hiding this comment

andreiio Mar 17, 2022

Choose a reason for hiding this comment

andreiio Mar 17, 2022

Choose a reason for hiding this comment

andreiio Mar 17, 2022

Choose a reason for hiding this comment

andreiio Mar 17, 2022

Choose a reason for hiding this comment

beniamin commented Mar 7, 2022 •

edited

Loading

cstns commented Mar 7, 2022 •

edited

Loading

andreiio left a comment •

edited

Loading