Refactor: the app.py calculation to be hanlde by a separate module

Author: mmsesay

FlaskSimpleCalculator/__pycache__/app.cpython-38.pyc

@@ -1,4 +1,5 @@
 from flask import Flask, render_template, request
+from handle_calculation import calculate
 
 app = Flask(__name__)
 app.config.from_object(__name__)
@@ -8,24 +9,12 @@
 def welcome():
     return render_template('form.html')
 
-
 @app.route('/result', methods=['POST'])
 def result():
     operand_1 = request.form.get("operand_1", type=int)
     operand_2 = request.form.get("operand_2", type=int)
     operator = request.form.get("operator")
-    if(operand_2 == 0 and operator=='Division'):
-        result='Invalid_operation'
-    elif(operator == 'Addition'):
-        result = operand_1 + operand_2
-    elif(operator == 'Subtraction'):
-        result = operand_1 - operand_2
-    elif(operator == 'Multiplication'):
-        result = operand_1 * operand_2
-    elif(operator == 'Division'):
-        result = operand_1 / operand_2
-    else:
-        result = 'Invalid_Choice'
+    result = calculate(operand_1, operand_2, operator)
     entry = result
     return render_template('result.html', entry=entry)
 

FlaskSimpleCalculator/__pycache__/handle_calculation.cpython-38.pyc

@@ -0,0 +1,26 @@
+# handle_calculation.py
+
+def calculate(operand_1: int, operand_2: int, operator: str) -> int:
+  """
+  calculation between the operands using the operator and returns a value 
+
+  Parameters:
+
+  -operand_1: the first given value
+  -operand_2: the second given value
+  -operator: used to trigger the calculation
+  """
+  if(operand_2 == 0 and operator=='Division'):
+    result='Invalid_operation'
+  elif(operator == 'Addition'):
+    result = operand_1 + operand_2
+  elif(operator == 'Subtraction'):
+    result = operand_1 - operand_2
+  elif(operator == 'Multiplication'):
+    result = operand_1 * operand_2
+  elif(operator == 'Division'):
+    result = operand_1 / operand_2
+  else:
+    result = 'Invalid_Choice'
+
+  return result

FlaskSimpleCalculator/app.py

@@ -29,25 +29,25 @@
 						</div>
 					</div>
 					<div class="form-group">
-            			<label class="control-label col-xs-3">OPERATOR:</label>
-            			<div class="col-xs-5">
-                			<select class="form-control" name="operator">
-                    			<option>Addition</option>
-                    			<option>Subtraction</option>
-                    			<option>Multiplication</option>
-                    			<option>Division</option>
-                			</select>
-            			</div>
-            		</div>
+						<label class="control-label col-xs-3">OPERATOR:</label>
+						<div class="col-xs-5">
+							<select class="form-control" name="operator">
+								<option>Addition</option>
+								<option>Subtraction</option>
+								<option>Multiplication</option>
+								<option>Division</option>
+							</select>
+						</div>
+					</div>
 					<div class="form-group">
-            			<div class="col-xs-offset-3 col-xs-9">
-                			<input type="submit" class="btn btn-success" value="Submit">
-                			<input type="reset" class="btn btn-danger" value="Reset">
-            			</div>
-        			</div>
-        		</form>
-        	</div>
-        	<div class="col-md-4"></div></div>
+						<div class="col-xs-offset-3 col-xs-9">
+							<input type="submit" class="btn btn-success" value="Submit">
+							<input type="reset" class="btn btn-danger" value="Reset">
+						</div>
+					</div>
+				</form>
+			</div>
+			<div class="col-md-4"></div></div>
 		</div>
 	</body>
 </html>