PullRequest#2

.github/workflows/main.yml

@@ -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"

.jshintrc

@@ -0,0 +1,3 @@
+{
+  "esversion": 6
+}

server/database/app.js

@@ -1,104 +1,110 @@
+/*jshint esversion: 8 */ // This line should already be at the top from previous fixes.
+
 const express = require('express');
 const mongoose = require('mongoose');
 const fs = require('fs');
-const  cors = require('cors')
-const app = express()
+const cors = require('cors'); // Corrected spacing
+const app = express(); // Added semicolon
 const port = 3030;
 
-app.use(cors())
-app.use(require('body-parser').urlencoded({ extended: false }));
-
-const reviews_data = JSON.parse(fs.readFileSync("reviews.json", 'utf8'));
-const dealerships_data = JSON.parse(fs.readFileSync("dealerships.json", 'utf8'));
+app.use(cors()); // Added semicolon
+app.use(require('body-parser').urlencoded({ extended: false })); // Added semicolon
 
-mongoose.connect("mongodb://mongo_db:27017/",{'dbName':'dealershipsDB'});
+const reviews_data = JSON.parse(fs.readFileSync("reviews.json", 'utf8')); // Added semicolon
+const dealerships_data = JSON.parse(fs.readFileSync("dealerships.json", 'utf8')); // Added semicolon
 
+mongoose.connect("mongodb://mongo_db:27017/", {'dbName': 'dealershipsDB'}); // Added semicolon and fixed spacing
 
-const Reviews = require('./review');
+const Reviews = require('./review'); // Added semicolon
 
-const Dealerships = require('./dealership');
+const Dealerships = require('./dealership'); // Added semicolon
 
 try {
-  Reviews.deleteMany({}).then(()=>{
-    Reviews.insertMany(reviews_data['reviews']);
-  });
-  Dealerships.deleteMany({}).then(()=>{
-    Dealerships.insertMany(dealerships_data['dealerships']);
-  });
-  
+    Reviews.deleteMany({}).then(() => {
+        Reviews.insertMany(reviews_data.reviews); // Fixed to dot notation: reviews_data['reviews'] -> reviews_data.reviews
+    });
+    Dealerships.deleteMany({}).then(() => {
+        Dealerships.insertMany(dealerships_data.dealerships); // Fixed to dot notation: dealerships_data['dealerships'] -> dealerships_data.dealerships
+    });
+
 } catch (error) {
-  res.status(500).json({ error: 'Error fetching documents' });
+    res.status(500).json({ error: 'Error fetching documents' });
 }
 
 
 // Express route to home
 app.get('/', async (req, res) => {
-    res.send("Welcome to the Mongoose API")
+    res.send("Welcome to the Mongoose API"); // Added semicolon
 });
 
 // Express route to fetch all reviews
 app.get('/fetchReviews', async (req, res) => {
-  try {
-    const documents = await Reviews.find();
-    res.json(documents);
-  } catch (error) {
-    res.status(500).json({ error: 'Error fetching documents' });
-  }
+    try {
+        const documents = await Reviews.find();
+        res.json(documents);
+    } catch (error) {
+        res.status(500).json({ error: 'Error fetching documents' });
+    }
 });
 
 // Express route to fetch reviews by a particular dealer
 app.get('/fetchReviews/dealer/:id', async (req, res) => {
-  try {
-    const documents = await Reviews.find({dealership: req.params.id});
-    res.json(documents);
-  } catch (error) {
-    res.status(500).json({ error: 'Error fetching documents' });
-  }
+    try {
+        const documents = await Reviews.find({ dealership: req.params.id });
+        res.json(documents);
+    } catch (error) {
+        res.status(500).json({ error: 'Error fetching documents' });
+    }
 });
 
 // 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
+
 });
 
 // Express route to fetch dealer by a particular id
 app.get('/fetchDealer/:id', async (req, res) => {
-//Write your code here
+    //Write your code here
 });
 
 //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 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'],
-	});
-
-  try {
-    const savedReview = await review.save();
-    res.json(savedReview);
-  } catch (error) {
-		console.log(error);
-    res.status(500).json({ error: 'Error inserting review' });
-  }
+    data = JSON.parse(req.body); // Added semicolon
+    const documents = await Reviews.find().sort({ id: -1 }); // Added semicolon
+    let new_id = documents[0].id + 1; // Fixed to dot notation: documents[0]['id'] -> documents[0].id
+
+    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
+    });
+
+    try {
+        const savedReview = await review.save();
+        res.json(savedReview);
+    } catch (error) {
+        console.log(error); // Added semicolon
+        res.status(500).json({ error: 'Error inserting review' });
+    }
 });
 
 // Start the Express server
 app.listen(port, () => {
-  console.log(`Server is running on http://localhost:${port}`);
+    console.log(`Server is running on http://localhost:${port}`);
 });

server/djangoapp/.env

@@ -1,2 +1,3 @@
 backend_url =your backend url
-sentiment_analyzer_url=your code engine deployment url
+sentiment_analyzer_url=https://sentianalyzer.1y32t94nuhbv.us-south.codeengine.appdomain.cloud/
+backend_url = https://brody8991-3030.theiadockernext-1-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai/

server/djangoapp/admin.py

@@ -1,8 +1,10 @@
-# from django.contrib import admin
-# from .models import related models
+from django.contrib import admin
+from .models import CarMake, CarModel
 
 
 # Register your models here.
+admin.site.register(CarMake)
+admin.site.register(CarModel)
 
 # CarModelInline class
 

server/djangoapp/apps.py

@@ -2,4 +2,4 @@
 
 
 class DjangoappConfig(AppConfig):
-    name = 'djangoapp'
+    name = "djangoapp"

server/djangoapp/microservices/app.py

@@ -1,30 +1,31 @@
 from flask import Flask
 from nltk.sentiment import SentimentIntensityAnalyzer
 import json
+
 app = Flask("Sentiment Analyzer")
 
 sia = SentimentIntensityAnalyzer()
 
 
-@app.get('/')
+@app.get("/")
 def home():
     return "Welcome to the Sentiment Analyzer. \
     Use /analyze/text to get the sentiment"
 
 
-@app.get('/analyze/<input_txt>')
+@app.get("/analyze/<input_txt>")
 def analyze_sentiment(input_txt):
 
     scores = sia.polarity_scores(input_txt)
     print(scores)
-    pos = float(scores['pos'])
-    neg = float(scores['neg'])
-    neu = float(scores['neu'])
+    pos = float(scores["pos"])
+    neg = float(scores["neg"])
+    neu = float(scores["neu"])
     res = "positive"
     print("pos neg nue ", pos, neg, neu)
-    if (neg > pos and neg > neu):
+    if neg > pos and neg > neu:
         res = "negative"
-    elif (neu > neg and neu > pos):
+    elif neu > neg and neu > pos:
         res = "neutral"
     res = json.dumps({"sentiment": res})
     print(res)

server/djangoapp/migrations/0001_initial.py

@@ -0,0 +1,82 @@
+# Generated by Django 5.2.4 on 2025-07-20 16:03
+
+import django.core.validators
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="CarMake",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=100)),
+                ("description", models.TextField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name="CarModel",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("dealer_id", models.IntegerField(null=True)),
+                ("name", models.CharField(max_length=100)),
+                (
+                    "type",
+                    models.CharField(
+                        choices=[
+                            ("SEDAN", "Sedan"),
+                            ("SUV", "SUV"),
+                            ("WAGON", "Wagon"),
+                            ("TRUCK", "Truck"),
+                            ("HATCHBACK", "Hatchback"),
+                            ("COUPE", "Coupe"),
+                            ("CONVERTIBLE", "Convertible"),
+                            ("MINIVAN", "Minivan"),
+                            ("PICKUP", "Pickup"),
+                        ],
+                        default="SUV",
+                        max_length=15,
+                    ),
+                ),
+                (
+                    "year",
+                    models.IntegerField(
+                        default=2023,
+                        validators=[
+                            django.core.validators.MaxValueValidator(2023),
+                            django.core.validators.MinValueValidator(2015),
+                        ],
+                    ),
+                ),
+                (
+                    "car_make",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="djangoapp.carmake",
+                    ),
+                ),
+            ],
+        ),
+    ]