Skip to content

Commit 3567f33

Browse files
KaiPexgoKaiPexgo
committed
python lint
1 parent b20e829 commit 3567f33

File tree

7 files changed

+201
-76
lines changed

7 files changed

+201
-76
lines changed

‎server/djangoapp/models.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Uncomment the following imports before adding the Model code
22

33
from django.db import models
4-
from django.utils.timezone import now
4+
# from django.utils.timezone import now
55
from django.core.validators import MaxValueValidator, MinValueValidator
66

77

@@ -33,7 +33,7 @@ def __str__(self):
3333
# - __str__ method to print a car make object
3434

3535
class CarModel(models.Model):
36-
car_make = models.ForeignKey(CarMake, on_delete=models.CASCADE) # Many-to-One relationship
36+
car_make = models.ForeignKey(CarMake, on_delete=models.CASCADE)
3737
name = models.CharField(max_length=100)
3838
CAR_TYPES = [
3939
('SEDAN', 'Sedan'),
@@ -42,12 +42,14 @@ class CarModel(models.Model):
4242
# Add more choices as required
4343
]
4444
type = models.CharField(max_length=10, choices=CAR_TYPES, default='SUV')
45-
year = models.IntegerField(default=2023,
45+
year = models.IntegerField(
46+
default=2023,
4647
validators=[
4748
MaxValueValidator(2023),
4849
MinValueValidator(2015)
4950
])
5051
# Other fields as needed
5152

5253
def __str__(self):
53-
return self.name # Return the name as the string representation
54+
return self.name # Return the name as the string representation
55+

‎server/djangoapp/populate.py‎

Lines changed: 113 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,129 @@
11
from .models import CarMake, CarModel
22

3+
34
def initiate():
45
car_make_data = [
5-
{"name":"NISSAN", "description":"Great cars. Japanese technology"},
6-
{"name":"Mercedes", "description":"Great cars. German technology"},
7-
{"name":"Audi", "description":"Great cars. German technology"},
8-
{"name":"Kia", "description":"Great cars. Korean technology"},
9-
{"name":"Toyota", "description":"Great cars. Japanese technology"},
6+
{
7+
"name": "NISSAN",
8+
"description": "Great cars. Japanese technology"
9+
},
10+
{
11+
"name": "Mercedes",
12+
"description":"Great cars. German technology"
13+
},
14+
{
15+
"name": "Audi",
16+
"description":"Great cars. German technology"
17+
},
18+
{
19+
"name": "Kia",
20+
"description":"Great cars. Korean technology"
21+
},
22+
{
23+
"name": "Toyota",
24+
"description":"Great cars. Japanese technology"
25+
},
1026
]
1127

1228
car_make_instances = []
1329
for data in car_make_data:
14-
car_make_instances.append(CarMake.objects.create(name=data['name'], description=data['description']))
30+
car_make_instances.append(CarMake.objects.create(name=data['name'], description=data['description']))
1531

1632

1733
# Create CarModel instances with the corresponding CarMake instances
1834
car_model_data = [
19-
{"name":"Pathfinder", "type":"SUV", "year": 2023, "car_make":car_make_instances[0]},
20-
{"name":"Qashqai", "type":"SUV", "year": 2023, "car_make":car_make_instances[0]},
21-
{"name":"XTRAIL", "type":"SUV", "year": 2023, "car_make":car_make_instances[0]},
22-
{"name":"A-Class", "type":"SUV", "year": 2023, "car_make":car_make_instances[1]},
23-
{"name":"C-Class", "type":"SUV", "year": 2023, "car_make":car_make_instances[1]},
24-
{"name":"E-Class", "type":"SUV", "year": 2023, "car_make":car_make_instances[1]},
25-
{"name":"A4", "type":"SUV", "year": 2023, "car_make":car_make_instances[2]},
26-
{"name":"A5", "type":"SUV", "year": 2023, "car_make":car_make_instances[2]},
27-
{"name":"A6", "type":"SUV", "year": 2023, "car_make":car_make_instances[2]},
28-
{"name":"Sorrento", "type":"SUV", "year": 2023, "car_make":car_make_instances[3]},
29-
{"name":"Carnival", "type":"SUV", "year": 2023, "car_make":car_make_instances[3]},
30-
{"name":"Cerato", "type":"Sedan", "year": 2023, "car_make":car_make_instances[3]},
31-
{"name":"Corolla", "type":"Sedan", "year": 2023, "car_make":car_make_instances[4]},
32-
{"name":"Camry", "type":"Sedan", "year": 2023, "car_make":car_make_instances[4]},
33-
{"name":"Kluger", "type":"SUV", "year": 2023, "car_make":car_make_instances[4]},
35+
{
36+
"name": "Pathfinder",
37+
"type": "SUV",
38+
"year": 2023,
39+
"car_make": car_make_instances[0]
40+
},
41+
{
42+
"name": "Qashqai",
43+
"type": "SUV",
44+
"year": 2023,
45+
"car_make": car_make_instances[0]
46+
},
47+
{
48+
"name": "XTRAIL",
49+
"type": "SUV",
50+
"year": 2023,
51+
"car_make": car_make_instances[0]
52+
},
53+
{
54+
"name": "A-Class",
55+
"type": "SUV",
56+
"year": 2023,
57+
"car_make": car_make_instances[1]
58+
},
59+
{
60+
"name": "C-Class",
61+
"type": "SUV",
62+
"year": 2023,
63+
"car_make": car_make_instances[1]
64+
},
65+
{
66+
"name": "E-Class",
67+
"type": "SUV",
68+
"year": 2023,
69+
"car_make": car_make_instances[1]
70+
},
71+
{
72+
"name": "A4",
73+
"type": "SUV",
74+
"year": 2023,
75+
"car_make": car_make_instances[2]
76+
},
77+
{
78+
"name": "A5",
79+
"type": "SUV",
80+
"year": 2023,
81+
"car_make": car_make_instances[2]
82+
},
83+
{
84+
"name": "A6",
85+
"type": "SUV",
86+
"year": 2023,
87+
"car_make": car_make_instances[2]
88+
},
89+
{
90+
"name": "Sorrento",
91+
"type": "SUV",
92+
"year": 2023,
93+
"car_make": car_make_instances[3]
94+
},
95+
{
96+
"name": "Carnival",
97+
"type": "SUV",
98+
"year": 2023,
99+
"car_make": car_make_instances[3]
100+
},
101+
{
102+
"name": "Cerato",
103+
"type": "Sedan",
104+
"year": 2023,
105+
"car_make": car_make_instances[3]
106+
},
107+
{
108+
"name": "Corolla",
109+
"type": "Sedan",
110+
"year": 2023,
111+
"car_make": car_make_instances[4]
112+
},
113+
{
114+
"name": "Camry",
115+
"type": "Sedan",
116+
"year": 2023,
117+
"car_make": car_make_instances[4]
118+
},
119+
{
120+
"name": "Kluger",
121+
"type": "SUV",
122+
"year": 2023,
123+
"car_make": car_make_instances[4]
124+
},
34125
# Add more CarModel instances as needed
35126
]
36127

37128
for data in car_model_data:
38-
CarModel.objects.create(name=data['name'], car_make=data['car_make'], type=data['type'], year=data['year'])
129+
CarModel.objects.create(name=data['name'], car_make=data['car_make'], type=data['type'], year=data['year'])

‎server/djangoapp/restapis.py‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
# Add code for get requests to back end
1616
def get_request(endpoint, **kwargs):
1717
params = ""
18-
if(kwargs):
19-
for key,value in kwargs.items():
20-
params=params+key+"="+value+"&"
18+
if (kwargs):
19+
for key, value in kwargs.items():
20+
params = params+key+"="+value+"&"
2121

2222
request_url = backend_url+endpoint+"?"+params
2323

@@ -26,13 +26,14 @@ def get_request(endpoint, **kwargs):
2626
# Call get method of requests library with URL and parameters
2727
response = requests.get(request_url)
2828
return response.json()
29-
except:
29+
except Exception:
3030
# If any error occurs
3131
print("Network exception occurred")
3232

3333
# def analyze_review_sentiments(text):
3434
# request_url = sentiment_analyzer_url+"analyze/"+text
3535
# Add code for retrieving sentiments
36+
3637
def analyze_review_sentiments(text):
3738
request_url = sentiment_analyzer_url+"/analyze/"+text
3839
try:
@@ -45,11 +46,12 @@ def analyze_review_sentiments(text):
4546

4647
# def post_review(data_dict):
4748
# Add code for posting review
49+
4850
def post_review(data_dict):
4951
request_url = backend_url+"/insert_review"
5052
try:
51-
response = requests.post(request_url,json=data_dict)
53+
response = requests.post(request_url, json=data_dict)
5254
print(response.json())
5355
return response.json()
54-
except:
56+
except Exception:
5557
print("Network exception occurred")

‎server/djangoapp/urls.py‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,25 @@
66

77
app_name = 'djangoapp'
88
urlpatterns = [
9-
# # path for registration
109
path(route='register', view=views.registration, name='register'),
11-
12-
# path for login
1310
path(route='login', view=views.login_user, name='login'),
14-
15-
# path for logout
1611
path(route='logout', view=views.logout_request, name='logout'),
17-
18-
# path for dealer reviews view
1912
path(route='get_dealers', view=views.get_dealerships, name='get_dealers'),
20-
path(route='get_dealers/<str:state>', view=views.get_dealerships, name='get_dealers_by_state'),
21-
path(route='dealer/<int:dealer_id>', view=views.get_dealer_details, name='get_dealer_details'),
22-
path(route='reviews/dealer/<int:dealer_id>', view=views.get_dealer_reviews, name='dealer_details'),
23-
24-
25-
# path for add a review view
13+
path(
14+
route='get_dealers/<str:state>',
15+
view=views.get_dealerships,
16+
name='get_dealers_by_state'
17+
),
18+
path(
19+
route='dealer/<int:dealer_id>',
20+
view=views.get_dealer_details,
21+
name='get_dealer_details'
22+
),
23+
path(
24+
route='reviews/dealer/<int:dealer_id>',
25+
view=views.get_dealer_reviews,
26+
name='dealer_details'
27+
),
2628
path(route='add_review', view=views.add_review, name='add_review'),
27-
28-
29-
# path for get cars
3029
path(route='get_cars', view=views.get_cars, name ='getcars'),
31-
3230
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

0 commit comments

Comments
 (0)