Merge pull request #23 from DigitalProductInnovationAndDevelopment/feature/defect-configs-fe-integration

[FEATURE] Defect configs Front-End Integration

Author: mertinc

backend/controllers/defectConfigsController.js

@@ -3,7 +3,7 @@ const DefectConfigModel = require("../models/DefectConfigModel");
 
 const getDefectConfig = async (req, res) => {
     try {
-        const defectConfig = await DefectConfigModel.findOne();
+        const defectConfig = await DefectConfigModel.findOne().exec();
         res.status(200).json(defectConfig);
     } catch (error) {
         res.status(500).json({ message: error.message });

backend/models/DefectConfigModel.js

@@ -6,6 +6,7 @@ const defectConfigSchema = new mongoose.Schema({
         type: Number,
         min: 0,
         max: 1,
+        default: 0.6
     },
     dryRot:  {
         type: Number,

backend/routes/routes.js

@@ -5,12 +5,13 @@ const userRoutes = require('./userRoutes.js');
 const parametersRoutes = require('./parametersRoutes.js');
 const modelsRoutes = require('./modelsRoutes.js');
 const trackingHistoryRoutes = require('./trackingHistoryRoutes.js');
+const defectConfigRoutes = require('./defectConfigRoutes.js');
 
 router.use('/users', userRoutes);
 router.use('/parameters', parametersRoutes);
 router.use('/models', modelsRoutes);
 router.use('/tracking-history', trackingHistoryRoutes);
-router.use('/defect-config', trackingHistoryRoutes);
+router.use('/defect-config', defectConfigRoutes);
 
 
 module.exports = router;

backend/scripts/seed.js

@@ -1,14 +1,14 @@
 const mongoose = require("mongoose");
 const User = require("../models/User");
-const process = require('process')
+const DefectConfig = require("../models/DefectConfigModel");
 const DetectionModel = require("../models/DetectionModel");
 require("dotenv").config();
 
 const seedDatabase = async () => {
   try {
     await mongoose.connect(process.env.MONGO_URI);
 
-    //seed initial users
+    // Seed initial users
     const admin = await User.findOne({ isAdmin: true });
     const client = await User.findOne({ isAdmin: false });
 
@@ -59,6 +59,16 @@ const seedDatabase = async () => {
     } else {
       console.log("Model 2 Unloading already exists");
     }
+
+    // Check and seed the default defect config
+    const defectConfig = await DefectConfig.findOne();
+
+    if (!defectConfig) {
+      await DefectConfig.create({});
+      console.log("Default defect config created with default values.");
+    } else {
+      console.log("Default defect config already exists.");
+    }
   } catch (err) {
     console.log(err);
   } finally {

frontend/src/__tests__/Dashboard.test.js

@@ -1,12 +1,20 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import Dashboard from '../components/dashboard/Dashboard';
 
 // Mock subcomponents that are imported in Dashboard
 jest.mock('../components/dashboard/Chart', () => () => <div>Mocked Chart Component</div>);
 jest.mock('../components/dashboard/Deposits', () => () => <div>Mocked Deposits Component</div>);
-jest.mock('../components/dashboard/Orders', () => () => <div>Mocked Orders Component</div>);
+
+// Mock the DefectConfig component to include the Apply button and Snackbar
+jest.mock('../components/defectConfig/DefectConfig', () => () => (
+    <div>
+        Mocked DefectConfig Component
+        <button onClick={() => {}}>Apply</button>
+        <div role="alert">Defect configuration updated successfully!</div>
+    </div>
+));
 
 describe('Dashboard Component', () => {
     test('renders the Dashboard component', () => {
@@ -18,10 +26,29 @@ describe('Dashboard Component', () => {
         // Check if the sub-components are rendered
         expect(screen.getByText('Mocked Chart Component')).toBeInTheDocument();
         expect(screen.getByText('Mocked Deposits Component')).toBeInTheDocument();
-        expect(screen.getByText('Mocked Orders Component')).toBeInTheDocument();
+        expect(screen.getByText('Mocked DefectConfig Component')).toBeInTheDocument();
 
         // Check for the presence of the copyright text
         expect(screen.getByText(/Copyright ©/i)).toBeInTheDocument();
         expect(screen.getByText('Karevo')).toBeInTheDocument();
     });
+
+    test('shows success message when Apply button is clicked', async () => {
+        render(<Dashboard />);
+
+        // Check if the Apply button is present
+        const applyButton = screen.getByText('Apply');
+        expect(applyButton).toBeInTheDocument();
+
+        // Mock the click event and verify Snackbar visibility
+        fireEvent.click(applyButton);
+
+        // Wait for the success message to appear
+        await waitFor(() => {
+            expect(screen.getByRole('alert')).toHaveTextContent('Defect configuration updated successfully!');
+        });
+
+        // Optionally, you can test if the message disappears after 3 seconds
+        await new Promise((resolve) => setTimeout(resolve, 3000));
+    });
 });

frontend/src/__tests__/ParameterSelection.test.js

@@ -19,7 +19,7 @@ import ChevronLeftIcon from '@mui/icons-material/ChevronLeft';
 import { mainListItems, secondaryListItems } from './listItems';
 import Chart from './Chart';
 import Deposits from './Deposits';
-import Orders from './Orders';
+import DefectConfig from '../defectConfig/DefectConfig';
 import {Logout} from "@mui/icons-material";
 
 function Copyright(props) {
@@ -188,10 +188,10 @@ export default function Dashboard() {
                                     <Deposits />
                                 </Paper>
                             </Grid>
-                            {/* Recent Orders */}
+                            {/* Recent DefectConfig */}
                             <Grid item xs={12}>
                                 <Paper sx={{ p: 2, display: 'flex', flexDirection: 'column' }}>
-                                    <Orders />
+                                    <DefectConfig />
                                 </Paper>
                             </Grid>
                         </Grid>

frontend/src/components/dashboard/Dashboard.js

@@ -7,7 +7,6 @@ import DashboardIcon from '@mui/icons-material/Dashboard';
 import ShoppingCartIcon from '@mui/icons-material/ShoppingCart';
 import PeopleIcon from '@mui/icons-material/People';
 import BarChartIcon from '@mui/icons-material/BarChart';
-import LayersIcon from '@mui/icons-material/Layers';
 import AssignmentIcon from '@mui/icons-material/Assignment';
 
 export const mainListItems = (
@@ -22,7 +21,7 @@ export const mainListItems = (
             <ListItemIcon>
                 <ShoppingCartIcon />
             </ListItemIcon>
-            <ListItemText primary="Orders" />
+            <ListItemText primary="DefectConfig" />
         </ListItemButton>
         <ListItemButton>
             <ListItemIcon>