Skip to content

Commit 7db4ae3

Browse files
committed
Refactor code for improved readability and consistency across multiple files
1 parent 11ee2e5 commit 7db4ae3

File tree

9 files changed

+205
-104
lines changed

9 files changed

+205
-104
lines changed

server/djangoapp/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717

1818
# Registering models with their respective admins
1919
admin.site.register(CarMake)
20-
admin.site.register(CarModel)
20+
admin.site.register(CarModel)

server/djangoapp/apps.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from django.apps import AppConfig
22

3+
34
class DjangoappConfig(AppConfig):
45
default_auto_field = 'django.db.models.BigAutoField'
56
name = 'djangoapp'

server/djangoapp/migrations/0001_initial.py

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,61 @@ class Migration(migrations.Migration):
1616
migrations.CreateModel(
1717
name='CarMake',
1818
fields=[
19-
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
19+
(
20+
'id',
21+
models.BigAutoField(
22+
auto_created=True,
23+
primary_key=True,
24+
serialize=False,
25+
verbose_name='ID',
26+
),
27+
),
2028
('name', models.CharField(max_length=100)),
2129
('description', models.TextField()),
2230
],
2331
),
2432
migrations.CreateModel(
2533
name='CarModel',
2634
fields=[
27-
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
35+
(
36+
'id',
37+
models.BigAutoField(
38+
auto_created=True,
39+
primary_key=True,
40+
serialize=False,
41+
verbose_name='ID',
42+
),
43+
),
2844
('name', models.CharField(max_length=100)),
29-
('type', models.CharField(choices=[('SEDAN', 'Sedan'), ('SUV', 'SUV'), ('WAGON', 'Wagon')], default='SUV', max_length=10)),
30-
('year', models.IntegerField(default=2023, validators=[django.core.validators.MaxValueValidator(2023), django.core.validators.MinValueValidator(2015)])),
31-
('car_make', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='djangoapp.carmake')),
45+
(
46+
'type',
47+
models.CharField(
48+
choices=[
49+
('SEDAN', 'Sedan'),
50+
('SUV', 'SUV'),
51+
('WAGON', 'Wagon'),
52+
],
53+
default='SUV',
54+
max_length=10,
55+
),
56+
),
57+
(
58+
'year',
59+
models.IntegerField(
60+
default=2023,
61+
validators=[
62+
django.core.validators.MaxValueValidator(2023),
63+
django.core.validators.MinValueValidator(2015),
64+
],
65+
),
66+
),
67+
(
68+
'car_make',
69+
models.ForeignKey(
70+
on_delete=django.db.models.deletion.CASCADE,
71+
to='djangoapp.carmake',
72+
),
73+
),
3274
],
3375
),
3476
]

server/djangoapp/populate.py

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,48 @@
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+
{"name": "NISSAN", "description": "Great cars. Japanese technology"},
7+
{"name": "Mercedes", "description": "Great cars. German technology"},
8+
{"name": "Audi", "description": "Great cars. German technology"},
9+
{"name": "Kia", "description": "Great cars. Korean technology"},
10+
{"name": "Toyota", "description": "Great cars. Japanese technology"},
1011
]
1112

1213
car_make_instances = []
1314
for data in car_make_data:
14-
car_make_instances.append(CarMake.objects.create(name=data['name'], description=data['description']))
15-
15+
car_make_instances.append(
16+
CarMake.objects.create(
17+
name=data['name'],
18+
description=data['description'],
19+
)
20+
)
1621

1722
# Create CarModel instances with the corresponding CarMake instances
1823
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]},
24+
{"name": "Pathfinder", "type": "SUV", "year": 2023, "car_make": car_make_instances[0]},
25+
{"name": "Qashqai", "type": "SUV", "year": 2023, "car_make": car_make_instances[0]},
26+
{"name": "XTRAIL", "type": "SUV", "year": 2023, "car_make": car_make_instances[0]},
27+
{"name": "A-Class", "type": "SUV", "year": 2023, "car_make": car_make_instances[1]},
28+
{"name": "C-Class", "type": "SUV", "year": 2023, "car_make": car_make_instances[1]},
29+
{"name": "E-Class", "type": "SUV", "year": 2023, "car_make": car_make_instances[1]},
30+
{"name": "A4", "type": "SUV", "year": 2023, "car_make": car_make_instances[2]},
31+
{"name": "A5", "type": "SUV", "year": 2023, "car_make": car_make_instances[2]},
32+
{"name": "A6", "type": "SUV", "year": 2023, "car_make": car_make_instances[2]},
33+
{"name": "Sorrento", "type": "SUV", "year": 2023, "car_make": car_make_instances[3]},
34+
{"name": "Carnival", "type": "SUV", "year": 2023, "car_make": car_make_instances[3]},
35+
{"name": "Cerato", "type": "Sedan", "year": 2023, "car_make": car_make_instances[3]},
36+
{"name": "Corolla", "type": "Sedan", "year": 2023, "car_make": car_make_instances[4]},
37+
{"name": "Camry", "type": "Sedan", "year": 2023, "car_make": car_make_instances[4]},
38+
{"name": "Kluger", "type": "SUV", "year": 2023, "car_make": car_make_instances[4]},
3439
# Add more CarModel instances as needed
3540
]
3641

3742
for data in car_model_data:
38-
CarModel.objects.create(name=data['name'], car_make=data['car_make'], type=data['type'], year=data['year'])
43+
CarModel.objects.create(
44+
name=data['name'],
45+
car_make=data['car_make'],
46+
type=data['type'],
47+
year=data['year'],
48+
)

server/djangoapp/restapis.py

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,41 @@
66
load_dotenv()
77

88
backend_url = os.getenv(
9-
'backend_url', default="http://localhost:3030")
9+
'backend_url', default="http://localhost:3030"
10+
)
1011
sentiment_analyzer_url = os.getenv(
1112
'sentiment_analyzer_url',
12-
default="http://localhost:5050/")
13+
default="http://localhost:5050/",
14+
)
15+
1316

1417
# def get_request(endpoint, **kwargs):
1518
def get_request(endpoint, **kwargs):
1619
params = ""
17-
if(kwargs):
18-
for key,value in kwargs.items():
19-
params=params+key+"="+value+"&"
20+
if kwargs:
21+
for key, value in kwargs.items():
22+
params = params + key + "=" + value + "&"
2023

21-
request_url = backend_url+endpoint+"?"+params
24+
request_url = backend_url + endpoint + "?" + params
2225

2326
print("GET from {} ".format(request_url))
2427
try:
2528
# Call get method of requests library with URL and parameters
2629
response = requests.get(request_url)
2730
return response.json()
28-
except:
31+
except Exception:
2932
# If any error occurs
3033
print("Network exception occurred")
34+
35+
3136
# Add code for get requests to back end
3237

3338
# def analyze_review_sentiments(text):
3439
# request_url = sentiment_analyzer_url+"analyze/"+text
3540
# Add code for retrieving sentiments
41+
3642
def analyze_review_sentiments(text):
37-
request_url = sentiment_analyzer_url+"analyze/"+text
43+
request_url = sentiment_analyzer_url + "analyze/" + text
3844
try:
3945
# Call get method of requests library with URL and parameters
4046
response = requests.get(request_url)
@@ -43,13 +49,14 @@ def analyze_review_sentiments(text):
4349
print(f"Unexpected {err=}, {type(err)=}")
4450
print("Network exception occurred")
4551

52+
4653
# def post_review(data_dict):
4754
def post_review(data_dict):
48-
request_url = backend_url+"/insert_review"
55+
request_url = backend_url + "/insert_review"
4956
try:
50-
response = requests.post(request_url,json=data_dict)
57+
response = requests.post(request_url, json=data_dict)
5158
print(response.json())
5259
return response.json()
53-
except:
60+
except Exception:
5461
print("Network exception occurred")
5562
# Add code for posting review

server/djangoapp/urls.py

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,25 @@
1212
path(route='login', view=views.login_user, name='login'),
1313
path(route='logout', view=views.logout_request, name='logout'),
1414
path(route='register', view=views.registration, name='register'),
15-
path(route='get_cars', view=views.get_cars, name ='getcars'),
15+
path(route='get_cars', view=views.get_cars, name='getcars'),
1616

1717
# path for dealer reviews view
1818
path(route='get_dealers/', view=views.get_dealerships, name='get_dealers'),
19-
path(route='get_dealers/<str:state>', view=views.get_dealerships, name='get_dealers_by_state'),
19+
path(
20+
route='get_dealers/<str:state>',
21+
view=views.get_dealerships,
22+
name='get_dealers_by_state',
23+
),
2024
# path for add a review view
21-
path(route='reviews/dealer/<int:dealer_id>', view=views.get_dealer_reviews, name='dealer_details'),
25+
path(
26+
route='reviews/dealer/<int:dealer_id>',
27+
view=views.get_dealer_reviews,
28+
name='dealer_details',
29+
),
2230
path(route='add_review', view=views.add_review, name='add_review'),
23-
path(route='dealer/<int:dealer_id>', view=views.get_dealer_details, name='dealer_details'),
24-
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
25-
31+
path(
32+
route='dealer/<int:dealer_id>',
33+
view=views.get_dealer_details,
34+
name='dealer_details',
35+
),
36+
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

0 commit comments

Comments
 (0)