CREATE: diagram db methods added

backend/models/diagram_model.py

@@ -5,8 +5,8 @@ from config.database import db
 class Diagram(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     assignment_id = db.Column(db.Integer, db.ForeignKey('assignment.id'))
-    path = db.Column(db.String(80), nullable=False)
-    type = db.Column(db.String(80), nullable=False)
+    class_diagram_path = db.Column(db.String(80), nullable=False)
+    usecase_diagram_path = db.Column(db.String(80), nullable=False)
     created_at = db.Column(db.DateTime, default=datetime.now())
     updated_at = db.Column(db.DateTime, onupdate=datetime.now(), default=datetime.now())
 

backend/outputs/generated_class_files/hhiiofvlqz.py

+class WarehouseOperator: 
+	
+	 def create_orders_by_uploading_a_csv_file(self): 
+		 pass 
+
+	 def make_adjustments_to_the_order(self): 
+		 pass 
+
+	 def allocate_a_vehicle_for_a_job(self): 
+		 pass 
+
+	 def change_the_system_suggested_optimized_route_if_required(self): 
+		 pass 
+
+	 def confirm_a_job(self): 
+		 pass 
+
+	 def change_the_vehicle_allocated_for_a_job(self): 
+		 pass 
+
+	 def export_information_of_a_job_to_pdf_and_xls_format(self): 
+		 pass 
+
+	 def indicate_that_the_loading_is_completed(self): 
+		 pass 
+
+	 def generate_an_invoice_for_each_vehicle(self): 
+		 pass 
+
+	 def generate_vehicle_capacity_utilization_report(self): 
+		 pass 
+
+	 def generate_outlet_wise_transport_cost_report_for_a_given_date_range(self): 
+		 pass 
+
+	 def generate_vehicle_turnaround_time_report_for_a_warehouse(self): 
+		 pass 
+
+	 def generate_cost_per_1_kg_report(self): 
+		 pass 
+
+	 def generate_an_idle_time_limit_violation_report(self): 
+		 pass 
+
+
+
+class WarehouseIncharge: 
+	
+	 def confirm_the_delivered_items_to_a_outlet(self): 
+		 pass 
+
+	 def approve_a_job(self): 
+		 pass 
+
+	 def request_a_modification_to_the_planned_mileage_of_a_job(self): 
+		 pass 
+
+
+
+class Admin: 
+	
+	 def approve_the_planned_mileage_modification_request_submitted_by_the_WarehouseIncharge(self): 
+		 pass 
+
+	 def modify_the_minimum_fix_mileage_configuration_for_a_job(self): 
+		 pass 
+
+	 def modify_the_unloading_charge(self): 
+		 pass 
+
+	 def update_the_radius_limit_from_a_warehouse_for___drop_off___charges(self): 
+		 pass 
+
+	 def set_up_the___drop_off___rate_table_based_on_number_of_outlets_visited(self): 
+		 pass 
+
+	 def modify_the___drop_off___rate_table(self): 
+		 pass 
+
+	 def edit_the_eligibility_criteria_for_driver_incentive(self): 
+		 pass 
+
+	 def edit_the_per_km_rate_for_an_existing_vehicle_capacity_type(self): 
+		 pass 
+
+
+

backend/outputs/generated_dot_files/classes_hhiiofvlqz.dot

+digraph "classes_hhiiofvlqz" {
+rankdir=BT
+charset="utf-8"
+"hhiiofvlqz.Admin" [color="black", fontcolor="black", label="{Admin|\l|approve_the_planned_mileage_modification_request_submitted_by_the_WarehouseIncharge()\ledit_the_eligibility_criteria_for_driver_incentive()\ledit_the_per_km_rate_for_an_existing_vehicle_capacity_type()\lmodify_the___drop_off___rate_table()\lmodify_the_minimum_fix_mileage_configuration_for_a_job()\lmodify_the_unloading_charge()\lset_up_the___drop_off___rate_table_based_on_number_of_outlets_visited()\lupdate_the_radius_limit_from_a_warehouse_for___drop_off___charges()\l}", shape="record", style="solid"];
+"hhiiofvlqz.WarehouseIncharge" [color="black", fontcolor="black", label="{WarehouseIncharge|\l|approve_a_job()\lconfirm_the_delivered_items_to_a_outlet()\lrequest_a_modification_to_the_planned_mileage_of_a_job()\l}", shape="record", style="solid"];
+"hhiiofvlqz.WarehouseOperator" [color="black", fontcolor="black", label="{WarehouseOperator|\l|allocate_a_vehicle_for_a_job()\lchange_the_system_suggested_optimized_route_if_required()\lchange_the_vehicle_allocated_for_a_job()\lconfirm_a_job()\lcreate_orders_by_uploading_a_csv_file()\lexport_information_of_a_job_to_pdf_and_xls_format()\lgenerate_an_idle_time_limit_violation_report()\lgenerate_an_invoice_for_each_vehicle()\lgenerate_cost_per_1_kg_report()\lgenerate_outlet_wise_transport_cost_report_for_a_given_date_range()\lgenerate_vehicle_capacity_utilization_report()\lgenerate_vehicle_turnaround_time_report_for_a_warehouse()\lindicate_that_the_loading_is_completed()\lmake_adjustments_to_the_order()\l}", shape="record", style="solid"];
+}

backend/outputs/generated_dot_files/use_cases_kpalltubuk.dot

+digraph G {
+	rankdir=LR;
+	labelloc="b";
+	peripheries=0;
+
+	node [shape=plaintext]
+
+	subgraph WarehouseOperator {label="WarehouseOperator"; warehouseoperator};
+	warehouseoperator [image="D:\SLIIT\Year 4\Research Project\2022-158\backend/stick.png";peripheries=0;];
+
+	subgraph WarehouseIncharge {label="WarehouseIncharge"; warehouseincharge};
+	warehouseincharge [image="D:\SLIIT\Year 4\Research Project\2022-158\backend/stick.png";peripheries=0;];
+
+	subgraph Admin {label="Admin"; admin};
+	admin [image="D:\SLIIT\Year 4\Research Project\2022-158\backend/stick.png";peripheries=0;];
+
+	node [shape=ellipse, style=solid];
+
+	sign_up_to_the_system [label="Sign Up To The System"];
+	sign_in_to_the_system [label="Sign In To The System"];
+	create_orders_by_uploading_a_csv_file [label="Create Orders By Uploading A Csv File"];
+	make_adjustments_to_the_order [label="Make Adjustments To The Order"];
+	allocate_a_vehicle_for_a_job [label="Allocate A Vehicle For A Job"];
+	change_the_system_suggested_optimized_route_if_required [label="Change The System Suggested Optimized Route If Required"];
+	confirm_a_job [label="Confirm A Job"];
+	change_the_vehicle_allocated_for_a_job [label="Change The Vehicle Allocated For A Job"];
+	export_information_of_a_job_to_pdf_and_xls_format [label="Export Information Of A Job To Pdf And Xls Format"];
+	indicate_that_the_loading_is_completed [label="Indicate That The Loading Is Completed"];
+	confirm_the_delivered_items_to_a_outlet [label="Confirm The Delivered Items To A Outlet"];
+	approve_a_job [label="Approve A Job"];
+	request_a_modification_to_the_planned_mileage_of_a_job [label="Request A Modification To The Planned Mileage Of A Job"];
+	approve_the_planned_mileage_modification_request_submitted_by_the_warehouseincharge [label="Approve The Planned Mileage Modification Request Submitted By The Warehouseincharge"];
+	generate_an_invoice_for_each_vehicle [label="Generate An Invoice For Each Vehicle"];
+	modify_the_minimum_fix_mileage_configuration_for_a_job [label="Modify The Minimum Fix Mileage Configuration For A Job"];
+	modify_the_unloading_charge [label="Modify The Unloading Charge"];
+	update_the_radius_limit_from_a_warehouse_for___drop_off___charges [label="Update The Radius Limit From A Warehouse For   Drop Off   Charges"];
+	set_up_the___drop_off___rate_table_based_on_number_of_outlets_visited [label="Set Up The   Drop Off   Rate Table Based On Number Of Outlets Visited"];
+	modify_the___drop_off___rate_table [label="Modify The   Drop Off   Rate Table"];
+	edit_the_eligibility_criteria_for_driver_incentive [label="Edit The Eligibility Criteria For Driver Incentive"];
+	edit_the_per_km_rate_for_an_existing_vehicle_capacity_type [label="Edit The Per Km Rate For An Existing Vehicle Capacity Type"];
+	generate_vehicle_capacity_utilization_report [label="Generate Vehicle Capacity Utilization Report"];
+	generate_outlet_wise_transport_cost_report_for_a_given_date_range [label="Generate Outlet Wise Transport Cost Report For A Given Date Range"];
+	generate_vehicle_turnaround_time_report_for_a_warehouse [label="Generate Vehicle Turnaround Time Report For A Warehouse"];
+	generate_cost_per_1_kg_report [label="Generate Cost Per 1 Kg Report"];
+	generate_an_idle_time_limit_violation_report [label="Generate An Idle Time Limit Violation Report"];
+
+	edge [arrowhead="none"];
+
+	user->sign_up_to_the_system;
+	user->sign_in_to_the_system;
+	warehouseoperator->create_orders_by_uploading_a_csv_file;
+	warehouseoperator->make_adjustments_to_the_order;
+	warehouseoperator->allocate_a_vehicle_for_a_job;
+	warehouseoperator->change_the_system_suggested_optimized_route_if_required;
+	warehouseoperator->confirm_a_job;
+	warehouseoperator->change_the_vehicle_allocated_for_a_job;
+	warehouseoperator->export_information_of_a_job_to_pdf_and_xls_format;
+	warehouseoperator->indicate_that_the_loading_is_completed;
+	warehouseincharge->confirm_the_delivered_items_to_a_outlet;
+	warehouseincharge->approve_a_job;
+	warehouseincharge->request_a_modification_to_the_planned_mileage_of_a_job;
+	admin->approve_the_planned_mileage_modification_request_submitted_by_the_warehouseincharge;
+	warehouseoperator->generate_an_invoice_for_each_vehicle;
+	admin->modify_the_minimum_fix_mileage_configuration_for_a_job;
+	admin->modify_the_unloading_charge;
+	admin->update_the_radius_limit_from_a_warehouse_for___drop_off___charges;
+	admin->set_up_the___drop_off___rate_table_based_on_number_of_outlets_visited;
+	admin->modify_the___drop_off___rate_table;
+	admin->edit_the_eligibility_criteria_for_driver_incentive;
+	admin->edit_the_per_km_rate_for_an_existing_vehicle_capacity_type;
+	warehouseoperator->generate_vehicle_capacity_utilization_report;
+	warehouseoperator->generate_outlet_wise_transport_cost_report_for_a_given_date_range;
+	warehouseoperator->generate_vehicle_turnaround_time_report_for_a_warehouse;
+	warehouseoperator->generate_cost_per_1_kg_report;
+	warehouseoperator->generate_an_idle_time_limit_violation_report;
+
+	edge [arrowtail="vee", label="<<extend>>", style=dashed];
+
+	create_orders_by_uploading_a_csv_file->make_adjustments_to_the_order;
+	confirm_a_job->change_the_vehicle_allocated_for_a_job_change_the_system_suggested_optimized_route_if_required;
+
+	edge [arrowtail="vee", label="<<include>>", style=dashed];
+
+	confirm_a_job->allocate_a_vehicle_for_a_job;
+	approve_a_job->confirm_the_delivered_items_to_a_outlet;
+	request_a_modification_to_the_planned_mileage_of_a_job->approve_the_planned_mileage_modification_request_submitted_by_the_warehouseincharge;
+
+}
\ No newline at end of file

backend/routes/assignment_routes.py

-import json
-
 import requests
 from flask import Blueprint, jsonify, request
-from constants.http_status_codes_constant import HTTP_200_OK, HTTP_400_BAD_REQUEST, HTTP_201_CREATED
+from constants.http_status_codes_constant import HTTP_200_OK, HTTP_400_BAD_REQUEST, HTTP_201_CREATED, HTTP_500_INTERNAL_SERVER_ERROR
 from config.database import db
 from datetime import datetime
 from models.assignment_model import Assignment
@@ -21,16 +19,17 @@ def create_assignment():
     if not content or not module_id or not plagiarism_percentage or not start_at or not end_at:
         return jsonify({'err': 'Missing assignment details'}), HTTP_400_BAD_REQUEST
 
-    response = requests.post(url="http://127.0.0.1:5000/api/v1/diagrams/generate", json={"scenario": content})
+    assignment_obj = Assignment(content=content,
+                                module_id=module_id,
+                                plagiarism_percentage=plagiarism_percentage,
+                                start_at=start_at,
+                                end_at=end_at)
+    db.session.add(assignment_obj)
+    db.session.commit()
 
-    if response.ok:
-        assignment_obj = Assignment(content=content, module_id=module_id,
-                                    plagiarism_percentage=plagiarism_percentage,
-                                    start_at=start_at,
-                                    end_at=end_at)
-        db.session.add(assignment_obj)
-        db.session.commit()
+    response = requests.post(url="http://127.0.0.1:5000/api/v1/diagrams/generate", json={"scenario": content, "assignment_id": assignment_obj.id})
 
+    if response.ok:
         return jsonify({'msg': 'Assignment created', 'assignment': {
             'id': assignment_obj.id,
             'content': assignment_obj.content,
@@ -41,7 +40,10 @@ def create_assignment():
             'diagrams': response.json()
         }}), HTTP_201_CREATED
     else:
-        return jsonify({'err': 'Something went wrong'}), HTTP_400_BAD_REQUEST
+        assignment_obj = Assignment.query.filter_by(id=assignment_obj.id).first()
+        db.session.delete(assignment_obj)
+        db.commit()
+        return jsonify({'err': 'Something went wrong while generating model answers'}), HTTP_500_INTERNAL_SERVER_ERROR
 
 
 @assignment.get('/<assignment_id>')

backend/routes/diagram_routes.py

+from flask import request, jsonify, send_from_directory, Blueprint
+from werkzeug.exceptions import BadRequestKeyError
+
+import app
+from app import *
+from config.database import db
+from constants.http_status_codes_constant import HTTP_404_NOT_FOUND, HTTP_500_INTERNAL_SERVER_ERROR, HTTP_200_OK, \
+    HTTP_400_BAD_REQUEST
+import services.question_preprocess_service
+from models.diagram_model import Diagram
+
+diagram = Blueprint('diagrams', __name__, url_prefix='/api/v1/diagrams')
+
+
+@diagram.post('/generate')
+def generate_diagrams():
+    try:
+        data = request.get_json(silent=True)
+
+        if data is None:
+            return jsonify('Please attach a scenario file'), HTTP_400_BAD_REQUEST
+
+        generated_class_diagram_path, generated_usecase_diagram_path = services.question_preprocess_service.main(
+            data['scenario'])
+
+        if generated_usecase_diagram_path or generated_usecase_diagram_path:
+            diagram_obj = Diagram(assignment_id=data['assignment_id'],
+                                  usecase_diagram_path=generated_usecase_diagram_path,
+                                  class_diagram_path=generated_class_diagram_path)
+            db.session.add(diagram_obj)
+            db.session.commit()
+        else:
+            return jsonify('Something went wrong'), HTTP_500_INTERNAL_SERVER_ERROR
+
+        return jsonify(generated_class_diagram_path=generated_class_diagram_path,
+                       generated_usecase_diagram_path=generated_usecase_diagram_path), HTTP_200_OK
+
+    except Exception or BadRequestKeyError:
+        if BadRequestKeyError:
+            return jsonify('Please attach a scenario file'), HTTP_400_BAD_REQUEST
+        return jsonify('Something went wrong'), HTTP_500_INTERNAL_SERVER_ERROR
+
+
+@diagram.get('/<assignment_id>')
+def get_diagrams(assignment_id):
+    diagram_obj = Diagram.query.filter_by(assignment_id=assignment_id).first()
+
+    if diagram_obj is None:
+        return jsonify({"err": "No diagram found"}, HTTP_404_NOT_FOUND)
+
+    return jsonify({'msg': 'Diagrams found', 'diagrams': {'class_diagram': diagram_obj.class_diagram_path, 'usecase_diagram': diagram_obj.usecase_diagram_path}}), HTTP_200_OK