Skip to content

Commit 282108e

Browse files
committed
Module 5 commit 9 python issues linting done
1 parent 7a963f8 commit 282108e

File tree

8 files changed

+67
-34
lines changed

8 files changed

+67
-34
lines changed

server/database/app.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*jshint esversion: 8 */
12
const express = require('express');
23
const mongoose = require('mongoose');
34
const fs = require('fs');
@@ -18,10 +19,10 @@ const Dealerships = require('./dealership');
1819

1920
try {
2021
Reviews.deleteMany({}).then(() => {
21-
Reviews.insertMany(reviews_data['reviews']);
22+
Reviews.insertMany(reviews_data.reviews);
2223
});
2324
Dealerships.deleteMany({}).then(() => {
24-
Dealerships.insertMany(dealerships_data['dealerships']);
25+
Dealerships.insertMany(dealerships_data.dealerships);
2526
});
2627
} catch (error) {
2728
res.status(500).json({ error: 'Error fetching documents' });
@@ -86,18 +87,18 @@ app.get('/fetchDealer/:id', async (req, res) => {
8687
app.post('/insert_review', express.raw({ type: '*/*' }), async (req, res) => {
8788
const data = JSON.parse(req.body);
8889
const documents = await Reviews.find().sort({ id: -1 });
89-
const new_id = documents[0]['id'] + 1;
90+
const new_id = documents[0].id + 1;
9091

9192
const review = new Reviews({
9293
id: new_id,
93-
name: data['name'],
94-
dealership: data['dealership'],
95-
review: data['review'],
96-
purchase: data['purchase'],
97-
purchase_date: data['purchase_date'],
98-
car_make: data['car_make'],
99-
car_model: data['car_model'],
100-
car_year: data['car_year'],
94+
name: data.name,
95+
dealership: data.dealership,
96+
review: data.review,
97+
purchase: data.purchase,
98+
purchase_date: data.purchase_date,
99+
car_make: data.car_make,
100+
car_model: data.car_model,
101+
car_year: data.car_year,
101102
});
102103

103104
try {

server/database/dealership.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*jshint esversion: 8 */
12
const mongoose = require('mongoose');
23

34
const Schema = mongoose.Schema;

server/database/inventory.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*jshint esversion: 8 */
12
const { Int32 } = require('mongodb');
23
const mongoose = require('mongoose');
34

server/database/review.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*jshint esversion: 8 */
12
const mongoose = require('mongoose');
23

34
const Schema = mongoose.Schema;

server/djangoapp/models.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ class CarModel(models.Model):
3838
mileage, horsepower, and transmission.
3939
4040
Attributes:
41-
car_make (ForeignKey):
41+
car_make (ForeignKey):
4242
name (str): The name of the car model (e.g., Camry, A-Class).
4343
type (str): The type of the car (e.g., Sedan, SUV, Wagon).
4444
year (int): The year the car model was manufactured.
4545
engine_type (str, optional): The type of engine in the car.
46-
fuel_type (str):
46+
fuel_type (str):
4747
color (str, optional): The color of the car.
4848
price (decimal, optional): The price of the car.
4949
mileage (float, optional): The mileage of the car.
5050
horsepower (int, optional): The horsepower of the car's engine.
51-
transmission (str):
51+
transmission (str):
5252
"""
5353
car_make = models.ForeignKey(CarMake, on_delete=models.CASCADE)
5454
name = models.CharField(max_length=100)
@@ -59,11 +59,12 @@ class CarModel(models.Model):
5959
# Add more choices as required
6060
]
6161
type = models.CharField(max_length=10, choices=CAR_TYPES, default='SUV')
62-
year = models.IntegerField(default=2023,
63-
validators = [
64-
MaxValueValidator(2023),
65-
MinValueValidator(2015)
66-
])
62+
year = models.IntegerField(
63+
default=2023,
64+
validators = [
65+
MaxValueValidator(2023),
66+
MinValueValidator(2015)
67+
])
6768
engine_type = models.CharField(max_length=50, blank=True, null=True)
6869
fuel_type = models.CharField(
6970
max_length=20,
@@ -87,5 +88,6 @@ class CarModel(models.Model):
8788
choices=[('AUTOMATIC', 'Automatic'), ('MANUAL', 'Manual')],
8889
default='AUTOMATIC'
8990
)
91+
9092
def __str__(self):
9193
return self.name

server/djangoapp/populate.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ def initiate():
1111

1212
car_make_data = [
1313
{
14-
"name": "NISSAN",
15-
"description": "Great cars. Japanese technology",
14+
"name": "NISSAN",
15+
"description": "Great cars. Japanese technology",
1616
"country_of_origin": "Japan",
1717
"established_date": "1933-12-26"
1818
},

server/djangoapp/views.py

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,16 @@ def login_user(request):
2424
user = authenticate(username=username, password=password)
2525
if user is not None:
2626
login(request, user)
27-
return JsonResponse({"userName": username, "status": "Authenticated"})
27+
return JsonResponse(
28+
{
29+
"userName": username,
30+
"status": "Authenticated"
31+
})
2832

29-
return JsonResponse({"userName": username, "status": "Invalid credentials"})
33+
return JsonResponse({
34+
"userName": username,
35+
"status": "Invalid credentials"
36+
})
3037

3138
except json.JSONDecodeError:
3239
logger.exception("JSON decode error")
@@ -64,11 +71,19 @@ def registration(request):
6471
return JsonResponse({"userName": username, "error": "Already Registered"})
6572

6673
# Create user in auth_user table
67-
user = User.objects.create_user(username=username, first_name=first_name,
68-
last_name=last_name, password=password, email=email)
74+
user = User.objects.create_user(
75+
username=username,
76+
first_name=first_name,
77+
last_name=last_name,
78+
password=password,
79+
email=email
80+
)
6981
login(request, user)
7082

71-
return JsonResponse({"userName": username, "status": "Authenticated"})
83+
return JsonResponse({
84+
"userName": username,
85+
"status": "Authenticated"
86+
})
7287

7388
except json.JSONDecodeError:
7489
logger.exception("JSON decode error")
@@ -84,7 +99,10 @@ def get_dealerships(request, state="All"):
8499
try:
85100
endpoint = f"/fetchDealers/{state}" if state != "All" else "/fetchDealers"
86101
dealerships = get_request(endpoint)
87-
return JsonResponse({"status": 200, "dealers": dealerships})
102+
return JsonResponse({
103+
"status": 200,
104+
"dealers": dealerships
105+
})
88106

89107
except Exception as e:
90108
logger.exception("An error occurred while fetching dealerships")
@@ -133,7 +151,7 @@ def add_review(request):
133151
try:
134152
if not request.user.is_anonymous:
135153
data = json.loads(request.body)
136-
post_review_response = post_review(data)
154+
post_review(data)
137155
return JsonResponse({"status": 200})
138156

139157
return JsonResponse({"status": 403, "message": "Unauthorized"})

server/djangoproj/settings.py

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,14 @@
3333

3434
ALLOWED_HOSTS = [
3535
'localhost',
36-
'https://psoldev9-8000.theiadockernext-1-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai/'
36+
'https://psoldev9-8000.theiadockernext-1-labs-prod-theiak8s-4-tor01.proxy.'
37+
'cognitiveclass.ai/'
38+
]
39+
40+
CSRF_TRUSTED_ORIGINS = [
41+
'https://psoldev9-8000.theiadockernext-1-labs-prod-theiak8s-4-tor01.proxy.'
42+
'cognitiveclass.ai'
3743
]
38-
CSRF_TRUSTED_ORIGINS = ['https://psoldev9-8000.theiadockernext-1-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai']
3944

4045
REST_FRAMEWORK = {
4146
'DEFAULT_AUTHENTICATION_CLASSES': [],
@@ -99,16 +104,20 @@
99104

100105
AUTH_PASSWORD_VALIDATORS = [
101106
{
102-
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
107+
'NAME': 'django.contrib.auth.'
108+
'password_validation.UserAttributeSimilarityValidator',
103109
},
104110
{
105-
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
111+
'NAME': 'django.contrib.auth.password_validation.'
112+
'MinimumLengthValidator',
106113
},
107114
{
108-
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
115+
'NAME': 'django.contrib.auth.password_validation.'
116+
'CommonPasswordValidator',
109117
},
110118
{
111-
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
119+
'NAME': 'django.contrib.auth.password_validation.'
120+
'NumericPasswordValidator',
112121
},
113122
]
114123

0 commit comments

Comments
 (0)