Skip to content

Commit 64c5f58

Browse files
committed
Module 4 commit 5
1 parent 41e72c7 commit 64c5f58

File tree

10 files changed

+26
-18
lines changed

10 files changed

+26
-18
lines changed

server/database/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ app.get('/fetchDealers', async (req, res) => {
6969
// Express route to fetch Dealers by a particular state
7070
app.get('/fetchDealers/:state', async (req, res) => {
7171
try {
72-
const documents = await Dealerships.findOne({ 'state': req.params.state });
72+
const documents = await Dealerships.find({ 'state': req.params.state });
7373
res.json(documents);
7474
} catch (error) {
7575
res.status(500).json({ error: 'Error fetching documents' });

server/djangoapp/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
backend_url=https://psoldev9-3030.theiadockernext-1-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai
2-
sentiment_analyzer_url=https://sentianalyzer.1sm1xnv14v6p.us-south.codeengine.appdomain.cloud
2+
sentiment_analyzer_url=https://sentianalyzer.1sn5job4gm3l.us-south.codeengine.appdomain.cloud

server/djangoapp/__init__.py

Whitespace-only changes.

server/djangoapp/restapis.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment the imports below before you add the function code
2-
# import requests
2+
import requests
33
import os
44
from dotenv import load_dotenv
55

@@ -29,7 +29,7 @@ def get_request(endpoint, **kwargs):
2929
print("Network exception occurred")
3030

3131
def analyze_review_sentiments(text):
32-
request_url = sentiment_analyzer_url+"analyze/"+text
32+
request_url = sentiment_analyzer_url+"/analyze/"+text
3333
try:
3434
# Call get method of requests library with URL and parameters
3535
response = requests.get(request_url)

server/djangoapp/urls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
# path to get list of cars
2121
path(route='get_cars', view=views.get_cars, name ='getcars'),
2222

23-
path(route='get_dealers', view=views.get_dealerships, name='get_dealers'),
23+
path(route='get_dealers/', view=views.get_dealerships, name='get_dealers'),
2424
path(route='get_dealers/<str:state>', view=views.get_dealerships, name='get_dealers_by_state'),
2525
path(route='dealer/<int:dealer_id>', view=views.get_dealer_details, name='dealer_details'),
2626

2727
# path for dealer reviews view
28-
path(route='reviews/dealer/<int:dealer_id>', view=views.get_dealer_reviews, name='dealer_details'),
28+
path(route='reviews/dealer/<int:dealer_id>/', view=views.get_dealer_reviews, name='get_dealer_reviews'),
2929
# path for add a review view
3030
path(route='add_review', view=views.add_review, name='add_review'),
3131

server/djangoapp/views.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ def get_dealer_reviews(request, dealer_id):
9595
endpoint = "/fetchReviews/dealer/"+str(dealer_id)
9696
reviews = get_request(endpoint)
9797
for review_detail in reviews:
98-
response = analyze_review_sentiments(review_detail['review'])
99-
print(response)
100-
review_detail['sentiment'] = response['sentiment']
98+
response = analyze_review_sentiments(review_detail['review'])
99+
print(response)
100+
review_detail['sentiment'] = response['sentiment']
101101
return JsonResponse({"status":200,"reviews":reviews})
102102
else:
103103
return JsonResponse({"status":400,"message":"Bad Request"})
@@ -112,7 +112,9 @@ def get_dealer_details(request, dealer_id):
112112

113113
# Create a `add_review` view to submit a review
114114
# def add_review(request):
115+
@csrf_exempt
115116
def add_review(request):
117+
116118
if(request.user.is_anonymous == False):
117119
data = json.loads(request.body)
118120
try:

server/djangoproj/urls.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,7 @@
2727
path('contact/', TemplateView.as_view(template_name="Contact.html")),
2828
path('login/', TemplateView.as_view(template_name="index.html")),
2929
path('register/', TemplateView.as_view(template_name="index.html")),
30+
path('dealers/', TemplateView.as_view(template_name="index.html")),
31+
path('dealer/<int:dealer_id>',TemplateView.as_view(template_name="index.html")),
32+
path('postreview/<int:dealer_id>',TemplateView.as_view(template_name="index.html")),
3033
] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)

server/frontend/src/App.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
import LoginPanel from "./components/Login/Login"
22
import RegisterPanel from "./components/Register/Register"
3+
import Dealers from './components/Dealers/Dealers'
4+
import Dealer from "./components/Dealers/Dealer"
5+
import PostReview from "./components/Dealers/PostReview"
36
import { Routes, Route } from "react-router-dom";
47

58
function App() {
69
return (
710
<Routes>
8-
<Route path="/login" element={<LoginPanel />} />
9-
<Route path="/register" element={<RegisterPanel />} />
11+
<Route path="/login" element={<LoginPanel />} />
12+
<Route path="/register" element={<RegisterPanel />} />
13+
<Route path="/dealers" element={<Dealers/>} />
14+
<Route path="/dealer/:id" element={<Dealer/>} />
15+
<Route path="/postreview/:id" element={<PostReview/>} />
1016
</Routes>
1117
);
1218
}

server/frontend/src/components/Dealers/Dealer.jsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ const Dealer = () => {
3131
const retobj = await res.json();
3232

3333
if(retobj.status === 200) {
34-
let dealerobjs = Array.from(retobj.dealer)
35-
setDealer(dealerobjs[0])
34+
setDealer(retobj.dealer)
3635
}
3736
}
3837

@@ -72,7 +71,7 @@ return(
7271
<Header/>
7372
<div style={{marginTop:"10px"}}>
7473
<h1 style={{color:"grey"}}>{dealer.full_name}{postReview}</h1>
75-
<h4 style={{color:"grey"}}>{dealer['city']},{dealer['address']}, Zip - {dealer['zip']}, {dealer['state']} </h4>
74+
<h4 style={{color:"grey"}}>{dealer.city},{dealer.address}, Zip - {dealer.zip}, {dealer.state} </h4>
7675
</div>
7776
<div class="reviews_panel">
7877
{reviews.length === 0 && unreviewed === false ? (

server/frontend/src/components/Dealers/PostReview.jsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const PostReview = () => {
3535
let model_split = model.split(" ");
3636
let make_chosen = model_split[0];
3737
let model_chosen = model_split[1];
38-
38+
console.log("NAME::" + name)
3939
let jsoninput = JSON.stringify({
4040
"name": name,
4141
"dealership": id,
@@ -69,9 +69,7 @@ const PostReview = () => {
6969
const retobj = await res.json();
7070

7171
if(retobj.status === 200) {
72-
let dealerobjs = Array.from(retobj.dealer)
73-
if(dealerobjs.length > 0)
74-
setDealer(dealerobjs[0])
72+
setDealer(retobj.dealer)
7573
}
7674
}
7775

0 commit comments

Comments
 (0)