Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions server/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
FROM python:3.12.0-slim-bookworm

ENV PYTHONBUFFERED 1
ENV PYTHONWRITEBYTECODE 1

ENV APP=/app

# Change the workdir.
WORKDIR $APP

# Install the requirements
COPY requirements.txt $APP

RUN pip3 install -r requirements.txt

# Copy the rest of the files
COPY . $APP

EXPOSE 8000

RUN chmod +x /app/entrypoint.sh

ENTRYPOINT ["/bin/bash","/app/entrypoint.sh"]

CMD ["gunicorn", "--bind", ":8000", "--workers", "3", "djangoproj.wsgi"]
27 changes: 24 additions & 3 deletions server/database/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,38 @@ app.get('/fetchReviews/dealer/:id', async (req, res) => {

// Express route to fetch all dealerships
app.get('/fetchDealers', async (req, res) => {
//Write your code here
try {
const dealers = await Dealerships.find();
res.json(dealers);
} catch (error) {
res.status(500).json({ error: 'Error fetching dealerships' });
}
});

// Express route to fetch Dealers by a particular state
app.get('/fetchDealers/:state', async (req, res) => {
//Write your code here
const state = req.params.state;
try {
const dealers = await Dealerships.find({ state: state });
res.json(dealers);
} catch (error) {
res.status(500).json({ error: 'Error fetching dealerships by state' });
}
});

// Express route to fetch dealer by a particular id
app.get('/fetchDealer/:id', async (req, res) => {
//Write your code here
const id = req.params.id;
try {
const dealer = await Dealerships.findOne({ id: parseInt(id) });
if (dealer) {
res.json(dealer);
} else {
res.status(404).json({ error: 'Dealer not found' });
}
} catch (error) {
res.status(500).json({ error: 'Error fetching dealer' });
}
});

//Express route to insert review
Expand Down
29 changes: 29 additions & 0 deletions server/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
run: dealership
name: dealership
spec:
replicas: 1
selector:
matchLabels:
run: dealership
strategy:
rollingUpdate:
maxSurge: 25%
maxUnavailable: 25%
type: RollingUpdate
template:
metadata:
labels:
run: dealership
spec:
containers:
- image: us.icr.io/sn-labs-abdullahkh25/dealership:latest
imagePullPolicy: Always
name: dealership
ports:
- containerPort: 8000
protocol: TCP
restartPolicy: Always
4 changes: 2 additions & 2 deletions server/djangoapp/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
backend_url =your backend url
sentiment_analyzer_url=your code engine deployment url
backend_url =https://abdullahkh25-3030.theiadockernext-1-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai
sentiment_analyzer_url=https://sentianalyzer.1zyyxxfi2q75.us-south.codeengine.appdomain.cloud/
15 changes: 4 additions & 11 deletions server/djangoapp/admin.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
# from django.contrib import admin
# from .models import related models
from django.contrib import admin
from .models import CarMake, CarModel


# Register your models here.

# CarModelInline class

# CarModelAdmin class

# CarMakeAdmin class with CarModelInline

# Register models here
admin.site.register(CarMake)
admin.site.register(CarModel)
59 changes: 40 additions & 19 deletions server/djangoapp/models.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,46 @@
# Uncomment the following imports before adding the Model code
from django.db import models
from django.utils.timezone import now
from django.core.validators import MaxValueValidator, MinValueValidator

# from django.db import models
# from django.utils.timezone import now
# from django.core.validators import MaxValueValidator, MinValueValidator
# Car Make Model
class CarMake(models.Model):
name = models.CharField(max_length=100)
description = models.TextField()
country = models.CharField(max_length=50, blank=True, null=True) # optional extra field
founded_year = models.IntegerField(
validators=[MinValueValidator(1800), MaxValueValidator(now().year)],
blank=True,
null=True
)

def __str__(self):
return self.name

# Create your models here.

# <HINT> Create a Car Make model `class CarMake(models.Model)`:
# - Name
# - Description
# - Any other fields you would like to include in car make model
# - __str__ method to print a car make object
# Car Model Model
class CarModel(models.Model):
SEDAN = 'Sedan'
SUV = 'SUV'
WAGON = 'Wagon'
TRUCK = 'Truck'
COUPE = 'Coupe'

CAR_TYPE_CHOICES = [
(SEDAN, 'Sedan'),
(SUV, 'SUV'),
(WAGON, 'Wagon'),
(TRUCK, 'Truck'),
(COUPE, 'Coupe'),
]

car_make = models.ForeignKey(CarMake, on_delete=models.CASCADE, related_name='models')
dealer_id = models.IntegerField(null=True, blank=True)
name = models.CharField(max_length=100)
type = models.CharField(max_length=20, choices=CAR_TYPE_CHOICES)
year = models.IntegerField(
validators=[MinValueValidator(2015), MaxValueValidator(2023)]
)
color = models.CharField(max_length=30, blank=True, null=True) # optional extra field

# <HINT> Create a Car Model model `class CarModel(models.Model):`:
# - Many-To-One relationship to Car Make model (One Car Make has many
# Car Models, using ForeignKey field)
# - Name
# - Type (CharField with a choices argument to provide limited choices
# such as Sedan, SUV, WAGON, etc.)
# - Year (IntegerField) with min value 2015 and max value 2023
# - Any other fields you would like to include in car model
# - __str__ method to print a car make object
def __str__(self):
return f"{self.car_make.name} {self.name} ({self.year})"
44 changes: 43 additions & 1 deletion server/djangoapp/populate.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,44 @@
from .models import CarMake, CarModel

def initiate():
print("Populate not implemented. Add data manually")
car_make_data = [
{"name":"NISSAN", "description":"Great cars. Japanese technology"},
{"name":"Mercedes", "description":"Great cars. German technology"},
{"name":"Audi", "description":"Great cars. German technology"},
{"name":"Kia", "description":"Great cars. Korean technology"},
{"name":"Toyota", "description":"Great cars. Japanese technology"},
]

car_make_instances = []
for data in car_make_data:
car_make_instances.append(CarMake.objects.create(
name=data['name'],
description=data['description']
))

car_model_data = [
{"name":"Pathfinder", "type":"SUV", "year": 2023, "car_make": car_make_instances[0]},
{"name":"Qashqai", "type":"SUV", "year": 2023, "car_make": car_make_instances[0]},
{"name":"XTRAIL", "type":"SUV", "year": 2023, "car_make": car_make_instances[0]},
{"name":"A-Class", "type":"Sedan", "year": 2023, "car_make": car_make_instances[1]},
{"name":"C-Class", "type":"Sedan", "year": 2023, "car_make": car_make_instances[1]},
{"name":"E-Class", "type":"Sedan", "year": 2023, "car_make": car_make_instances[1]},
{"name":"A4", "type":"Sedan", "year": 2023, "car_make": car_make_instances[2]},
{"name":"A5", "type":"Coupe", "year": 2023, "car_make": car_make_instances[2]},
{"name":"A6", "type":"Sedan", "year": 2023, "car_make": car_make_instances[2]},
{"name":"Sorrento", "type":"SUV", "year": 2023, "car_make": car_make_instances[3]},
{"name":"Carnival", "type":"SUV", "year": 2023, "car_make": car_make_instances[3]},
{"name":"Cerato", "type":"Sedan", "year": 2023, "car_make": car_make_instances[3]},
{"name":"Corolla", "type":"Sedan", "year": 2023, "car_make": car_make_instances[4]},
{"name":"Camry", "type":"Sedan", "year": 2023, "car_make": car_make_instances[4]},
{"name":"Kluger", "type":"SUV", "year": 2023, "car_make": car_make_instances[4]},
]

for data in car_model_data:
CarModel.objects.create(
name=data['name'],
car_make=data['car_make'],
type=data['type'],
year=data['year'],
dealer_id=1 # required field
)
42 changes: 34 additions & 8 deletions server/djangoapp/restapis.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment the imports below before you add the function code
# import requests
import requests
import os
from dotenv import load_dotenv

Expand All @@ -11,12 +11,38 @@
'sentiment_analyzer_url',
default="http://localhost:5050/")

# def get_request(endpoint, **kwargs):
# Add code for get requests to back end
def get_request(endpoint, **kwargs):
params = ""
if(kwargs):
for key,value in kwargs.items():
params=params+key+"="+value+"&"

# def analyze_review_sentiments(text):
# request_url = sentiment_analyzer_url+"analyze/"+text
# Add code for retrieving sentiments
request_url = backend_url+endpoint+"?"+params

# def post_review(data_dict):
# Add code for posting review
print("GET from {} ".format(request_url))
try:
# Call get method of requests library with URL and parameters
response = requests.get(request_url)
return response.json()
except:
# If any error occurs
print("Network exception occurred")

def analyze_review_sentiments(text):
request_url = sentiment_analyzer_url+"analyze/"+text
try:
# Call get method of requests library with URL and parameters
response = requests.get(request_url)
return response.json()
except Exception as err:
print(f"Unexpected {err=}, {type(err)=}")
print("Network exception occurred")

def post_review(data_dict):
request_url = backend_url+"/insert_review"
try:
response = requests.post(request_url,json=data_dict)
print(response.json())
return response.json()
except:
print("Network exception occurred")
17 changes: 10 additions & 7 deletions server/djangoapp/urls.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
# Uncomment the imports before you add the code
# from django.urls import path
from django.urls import path
from django.conf.urls.static import static
from django.conf import settings
# from . import views
from . import views

app_name = 'djangoapp'
urlpatterns = [
# # path for registration

# path for login
# path(route='login', view=views.login_user, name='login'),

# path for dealer reviews view

# path for add a review view
path(route='login', view=views.login_user, name='login'),
path('logout', views.logout_user, name='logout'),
path(route='get_cars', view=views.get_cars, name ='getcars'),
path(route='get_dealers', view=views.get_dealerships, name='get_dealers'),
path(route='get_dealers/<str:state>', view=views.get_dealerships, name='get_dealers_by_state'),
path(route='dealer/<int:dealer_id>', view=views.get_dealer_details, name='dealer_details'),
path(route='reviews/dealer/<int:dealer_id>', view=views.get_dealer_reviews, name='dealer_details'),
path(route='add_review', view=views.add_review, name='add_review'),

] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
Loading