Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add files #145

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
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
59 changes: 59 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: 'Lint Code'

on:
push:
branches: [master, main]
pull_request:
branches: [master, main]

jobs:
lint_python:
name: Lint Python Files
runs-on: ubuntu-latest

steps:

- name: Checkout Repository
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.12

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8

- name: Print working directory
run: pwd

- name: Run Linter
run: |
pwd
# This command finds all Python files recursively and runs flake8 on them
find . -name "*.py" -exec flake8 {} +
echo "Linted all the python files successfully"

lint_js:
name: Lint JavaScript Files
runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v3

- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: 14

- name: Install JSHint
run: npm install jshint --global

- name: Run Linter
run: |
# This command finds all JavaScript files recursively and runs JSHint on them
find ./server/database -name "*.js" -exec jshint {} +
echo "Linted all the js files successfully"
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"]
53 changes: 37 additions & 16 deletions server/database/app.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
// jshint esversion: 6
// jshint esversion: 8

const express = require('express');
const mongoose = require('mongoose');
const fs = require('fs');
const cors = require('cors')
const app = express()
const cors = require('cors');
const app = express();
const port = 3030;

app.use(cors())
app.use(cors());
app.use(require('body-parser').urlencoded({ extended: false }));

const reviews_data = JSON.parse(fs.readFileSync("reviews.json", 'utf8'));
Expand All @@ -20,10 +23,10 @@ const Dealerships = require('./dealership');

try {
Reviews.deleteMany({}).then(()=>{
Reviews.insertMany(reviews_data['reviews']);
Reviews.insertMany(reviews_data.reviews);
});
Dealerships.deleteMany({}).then(()=>{
Dealerships.insertMany(dealerships_data['dealerships']);
Dealerships.insertMany(dealerships_data.dealerships);
});

} catch (error) {
Expand All @@ -33,7 +36,7 @@ try {

// Express route to home
app.get('/', async (req, res) => {
res.send("Welcome to the Mongoose API")
res.send("Welcome to the Mongoose API");
});

// Express route to fetch all reviews
Expand All @@ -59,34 +62,52 @@ 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 documents = await Dealerships.find();
res.json(documents);
} catch (error) {
res.status(500).json({ error: 'Error fetching documents' });
}
});

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

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

//Express route to insert review
app.post('/insert_review', express.raw({ type: '*/*' }), async (req, res) => {
data = JSON.parse(req.body);
const documents = await Reviews.find().sort( { id: -1 } )
let new_id = documents[0]['id']+1
const documents = await Reviews.find().sort( { id: -1 } );
let new_id = documents[0].id+1;

const review = new Reviews({
"id": new_id,
"name": data['name'],
"dealership": data['dealership'],
"review": data['review'],
"purchase": data['purchase'],
"purchase_date": data['purchase_date'],
"car_make": data['car_make'],
"car_model": data['car_model'],
"car_year": data['car_year'],
"name": data.name,
"dealership": data.dealership,
"review": data.review,
"purchase": data.purchase,
"purchase_date": data.purchase_date,
"car_make": data.car_make,
"car_model": data.car_model,
"car_year": data.car_year,
});

try {
Expand Down
3 changes: 3 additions & 0 deletions server/database/dealership.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// jshint esversion: 6


const mongoose = require('mongoose');

const Schema = mongoose.Schema;
Expand Down
2 changes: 2 additions & 0 deletions server/database/inventory.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// jshint esversion: 6

const { Int32 } = require('mongodb');
const mongoose = require('mongoose');

Expand Down
4 changes: 3 additions & 1 deletion server/database/review.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// jshint esversion: 6

const mongoose = require('mongoose');

const Schema = mongoose.Schema;
Expand Down Expand Up @@ -41,4 +43,4 @@ const reviews = new Schema({
},
});

module.exports = mongoose.model('reviews', reviews);
module.exports = mongoose.model('reviews', reviews);
Binary file added server/db.sqlite3
Binary file not shown.
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-u224c1a3036/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://rafaquintero-8000.theiadockernext-1-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai
sentiment_analyzer_url=https://sentianalyzer.1oi6u3rq0fjq.us-south.codeengine.appdomain.cloud/
Empty file removed server/djangoapp/__init__.py
Empty file.
8 changes: 6 additions & 2 deletions server/djangoapp/admin.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# from django.contrib import admin
# from .models import related models
from django.contrib import admin
from .models import CarMake, CarModel


# Register your models here.
Expand All @@ -11,3 +11,7 @@
# CarMakeAdmin class with CarModelInline

# Register models here

# Registering models with their respective admins
admin.site.register(CarMake)
admin.site.register(CarModel)
48 changes: 29 additions & 19 deletions server/djangoapp/models.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,35 @@
# Uncomment the following imports before adding the Model code
from django.db import models
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

class CarMake(models.Model):
name = models.CharField(max_length=100)
description = models.TextField()
# Other fields as needed

# Create your models here.
def __str__(self):
return self.name # Return the name as the string representation

# <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

class CarModel(models.Model):
car_make = models.ForeignKey(CarMake, on_delete=models.CASCADE)
# Many-to-One relationship
name = models.CharField(max_length=100)
CAR_TYPES = [
('SEDAN', 'Sedan'),
('SUV', 'SUV'),
('WAGON', 'Wagon'),
# Add more choices as required
]
type = models.CharField(max_length=10, choices=CAR_TYPES, default='SUV')
year = models.IntegerField(
default=2023,
validators=[
MaxValueValidator(2023),
MinValueValidator(2015)
]
)
# Other fields as needed

# <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 self.name # Return the name as the string representation
59 changes: 58 additions & 1 deletion server/djangoapp/populate.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,59 @@
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']
)
)

# Create CarModel instances with the corresponding CarMake instances
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": "SUV", "year": 2023, "car_make":
car_make_instances[1]},
{"name": "C-Class", "type": "SUV", "year": 2023, "car_make":
car_make_instances[1]},
{"name": "E-Class", "type": "SUV", "year": 2023, "car_make":
car_make_instances[1]},
{"name": "A4", "type": "SUV", "year": 2023, "car_make":
car_make_instances[2]},
{"name": "A5", "type": "SUV", "year": 2023, "car_make":
car_make_instances[2]},
{"name": "A6", "type": "SUV", "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]},
# Add more CarModel instances as needed
]

for data in car_model_data:
CarModel.objects.create(name=data['name'], car_make=data['car_make'],
type=data['type'], year=data['year'])
Loading