Merge branch '35-remove-dead-code-and-cleanup' of...

Merge branch '35-remove-dead-code-and-cleanup' of https://git.gvk.idi.ntnu.no/HermanDyrkorn/salamander-api into 35-remove-dead-code-and-cleanup

merge

api/endpoints/salamanders.py

@@ -2,7 +2,7 @@ from flask import jsonify
 from flask_jwt_extended import jwt_required, get_jwt_identity
 from flask_restful import Resource
 from api import db, limiter
-from api.models.dbmodels import Location, User, Salamander
+from api.models.dbmodels import Location, User, Salamander, SalamanderGrowth
 
 
 # get all salamanders on a specific location
@@ -21,7 +21,8 @@ class SalamandersEndpoint(Resource):
                 if salamanders:
                     salamander_list = []
                     for salamander in salamanders:
-                        ret = {"id": salamander.id, "sex": salamander.sex, "species": salamander.species, "date": salamander.last_date}
+                        growth = db.session.query(SalamanderGrowth).filter_by(salamander_id=salamander.id).all()
+                        ret = {"id": salamander.id, "sex": salamander.sex, "individuals": len(growth), "species": salamander.species, "date": salamander.last_date}
                         salamander_list.append(ret)
                     return jsonify({"salamanders": salamander_list, 'status': 200})
                 else: