Adding spa and api refactoring example

Author: Josh Reynolds

api/Makefile

@@ -1,11 +1,11 @@
-PYBIN=venv/bin
+PYBIN=.venv/bin
 
-venv: venv/bin/activate
+venv: .venv/bin/activate
 
-venv/bin/activate: requirements.txt
-	test -d venv || python3 -m venv venv
+.venv/bin/activate: requirements.txt
+	test -d venv || python3 -m venv .venv
 	. $(PYBIN)/activate; pip install -Ur requirements.txt
-	touch venv/bin/activate
+	touch .venv/bin/activate
 
 test: venv
 	. $(PYBIN)/activate; python -m unittest discover todo/unittests

api/backend/settings.py

@@ -42,6 +42,7 @@
     'corsheaders',            # add this
     'rest_framework',         # add this
     'todo',
+    'stats',
 ]
 
 

api/todo/stats.py

@@ -0,0 +1,39 @@
+import math
+import json
+
+
+class DataStats:
+    # original code sourced from https://github.com/lgiordani/datastats
+
+    def stats(self, data, iage, isalary):
+        # iage and isalary are the starting age and salary used to
+        # compute the average yearly increase of salary.
+
+        # Compute average yearly increase
+        average_age_increase = math.floor(
+            sum([e['age'] for e in data])/len(data)) - iage
+        average_salary_increase = math.floor(
+            sum([int(e['salary'][1:]) for e in data])/len(data)) - isalary
+
+        yearly_avg_increase = math.floor(
+            average_salary_increase/average_age_increase)
+
+        # Compute max salary
+        salaries = [int(e['salary'][1:]) for e in data]
+        threshold = '$' + str(max(salaries))
+
+        max_salary = [e for e in data if e['salary'] == threshold]
+
+        # Compute min salary
+        salaries = [int(d['salary'][1:]) for d in data]
+        min_salary = [e for e in data if e['salary'] ==
+                      '${}'.format(str(min(salaries)))]
+
+        return json.dumps({
+            'avg_age': math.floor(sum([e['age'] for e in data])/len(data)),
+            'avg_salary': math.floor(sum(
+                [int(e['salary'][1:]) for e in data])/len(data)),
+            'avg_yearly_increase': yearly_avg_increase,
+            'max_salary': max_salary,
+            'min_salary': min_salary
+        })

api/todo/unittests/test_stats.py

@@ -0,0 +1,59 @@
+import json
+from unittest import TestCase
+from todo.stats import DataStats
+
+
+test_data = [
+    {
+        "id": 1,
+        "name": "Laith",
+        "surname": "Simmons",
+        "age": 68,
+        "salary": "$27888"
+    },
+    {
+        "id": 2,
+        "name": "Mikayla",
+        "surname": "Henry",
+        "age": 49,
+        "salary": "$67137"
+    },
+    {
+        "id": 3,
+        "name": "Garth",
+        "surname": "Fields",
+        "age": 70,
+        "salary": "$70472"
+    }
+]
+
+
+class TestDataData(TestCase):
+
+    def test_json(self):
+
+        ds = DataStats()
+
+        expected_output = json.dumps(
+            {
+                'avg_age': 62,
+                'avg_salary': 55165,
+                'avg_yearly_increase': 837,
+                'max_salary': [{
+                    "id": 3,
+                    "name": "Garth",
+                    "surname": "Fields",
+                    "age": 70,
+                    "salary": "$70472"
+                }],
+                'min_salary': [{
+                    "id": 1,
+                    "name": "Laith",
+                    "surname": "Simmons",
+                    "age": 68,
+                    "salary": "$27888"
+                }]
+            }
+        )
+
+        self.assertEqual(expected_output, ds.stats(test_data, 20, 20000))

spa/.dockerignore

@@ -1,2 +1,5 @@
 node_modules
 build
+docker-compose.yml
+Dockerfile
+infrastructure

spa/docker-compose.yml

@@ -6,7 +6,7 @@ services:
       ports:
         - 3000:80
       environment:
-        - REACT_APP_API=web
+        - REACT_APP_API=localhost:8000
 
 
 networks:

spa/infrastructure/spa.yml

@@ -0,0 +1,33 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: spa
+spec:
+  replicas: 1
+  selector:
+      matchLabels:
+          app: spa
+  template:
+    metadata:
+      labels:
+        app: spa
+    spec:
+      containers:
+        - name: spa
+          image: class/spa:latest
+          imagePullPolicy: Never
+          ports:
+            - containerPort:  80
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: spa
+spec:
+  selector:
+    app: spa
+  ports:
+  - port: 80
+    targetPort: 80
+  type: NodePort

spa/package.json

@@ -17,6 +17,9 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "npx react-scripts build",
+    "build-docker-prod": "docker build . -t class/spa",
+    "deploy": "kubectl delete pod -l app=spa; kubectl apply -f infrastructure/spa.yml",
+    "bind-spa-locally": "kubectl port-forward service/spa 3000:80",
     "cy.run": "npx cypress run",
     "cy.open": "npx cypress open",
     "docker-compose": "docker-compose up --build",

spa/src/App.js

@@ -5,7 +5,7 @@ import Modal from "./components/Modal";
 import axios from "axios";
 
 const config = {
-  apiServer: process.env.REACT_APP_API
+  apiServer: process.env.REACT_APP_API ? process.env.REACT_APP_API : 'http://localhost:8000'
 }
 
 class App extends Component {