Metrics dash board

backend/__init__.py

@@ -250,6 +250,9 @@ def add_api_endpoints(app):
  from backend.api.users.statistics import (
  UsersStatisticsAPI,
  UsersStatisticsInterestsAPI,
+ UsersTaskMappedAPI,
+ UsersTeamStatsAPI,
+ UserSpecificAPI,
  )
 
  # System API endpoint
@@ -518,7 +521,6 @@ def add_api_endpoints(app):
  TasksActionsSplitAPI,
  format_url("projects/<int:project_id>/tasks/actions/split/<int:task_id>/"),
  )
-
  # Comments REST endoints
  api.add_resource(
  CommentsProjectsRestAPI,
@@ -677,6 +679,7 @@ def add_api_endpoints(app):
  # Users REST endpoint
  api.add_resource(UsersAllAPI, format_url("users/"))
  api.add_resource(UsersRestAPI, format_url("users/<int:user_id>/"))
+
  api.add_resource(
  UsersQueriesUsernameFilterAPI,
  format_url("users/queries/filter/<string:username>/"),
@@ -712,6 +715,7 @@ def add_api_endpoints(app):
  )
 
  api.add_resource(UsersTasksAPI, format_url("users/<int:user_id>/tasks/"))
+
  api.add_resource(
  UsersActionsVerifyEmailAPI, format_url("users/me/actions/verify-email/")
  )
@@ -724,6 +728,16 @@ def add_api_endpoints(app):
  UsersStatisticsAPI, format_url("users/<string:username>/statistics/")
  )
 
+ api.add_resource(
+ UsersTaskMappedAPI, format_url("users/<string:username>/userstaskmapped/")
+ )
+
+ api.add_resource(
+ UsersTeamStatsAPI, format_url("users/<string:username>/usersteamstats/")
+ )
+
+ api.add_resource(UserSpecificAPI, format_url("users/<string:username>/tasks/"))
+
  # User RecommendedProjects endpoint
  api.add_resource(
  UsersRecommendedProjectsAPI,

backend/api/users/statistics.py

@@ -1,7 +1,8 @@
-from flask_restful import Resource, current_app
+from flask_restful import Resource, current_app, request
 from backend.services.users.user_service import UserService, NotFound
 from backend.services.interests_service import InterestService
 from backend.services.users.authentication_service import token_auth
+from dateutil.parser import parse as date_parse
 
 
 class UsersStatisticsAPI(Resource):
@@ -27,6 +28,7 @@ def get(self, username):
  required: true
  type: string
  default: Thinkwhere
+
  responses:
  200:
  description: User found
@@ -87,3 +89,224 @@ def get(self, user_id):
  error_msg = f"Interest GET - unhandled error: {str(e)}"
  current_app.logger.critical(error_msg)
  return {"Error": error_msg}, 500
+
+
+class UsersTaskMappedAPI(Resource):
+ @token_auth.login_required
+ def get(self, username):
+ """
+ Get detailed stats about a user by OpenStreetMap username
+ ---
+ tags:
+ - users
+ produces:
+ - application/json
+ parameters:
+ - in: header
+ name: Authorization
+ description: Base64 encoded session token
+ required: true
+ type: string
+ default: Token sessionTokenHere==
+ - name: username
+ in: path
+ description: Mapper's OpenStreetMap username
+ required: true
+ type: string
+ default: Thinkwhere
+ - in: query
+ name: project_id
+ description: Project id
+ required: false
+ type: integer
+ default: null
+ - in: query
+ name: start_date
+ description: Date to filter as minimum
+ required: false
+ type: string
+ default: null
+ - in: query
+ name: end_date
+ description: Date to filter as maximum
+ required: false
+ type: string
+ default: null
+
+ responses:
+ 200:
+ description: User found
+ 401:
+ description: Unauthorized - Invalid credentials
+ 404:
+ description: User not found
+ 500:
+ description: Internal Server Error
+ """
+ try:
+ project_id = int(request.args.get("project_id", 0))
+ start_date = (
+ date_parse(request.args.get("start_date"))
+ if request.args.get("start_date")
+ else None
+ )
+ end_date = (
+ date_parse(request.args.get("end_date"))
+ if request.args.get("end_date")
+ else None
+ )
+ tasks_dto = UserService.get_tasks_mapped(username, start_date=start_date, end_date=end_date, project_id=project_id,)
+
+ return tasks_dto.to_primitive(), 200
+ except NotFound:
+ return {"Error": "User not found"}, 404
+ except Exception as e:
+ error_msg = f"User GET - unhandled error: {str(e)}"
+ current_app.logger.critical(error_msg)
+ return {"Error": "Unable to fetch user statistics"}, 500
+
+
+class UsersTeamStatsAPI(Resource):
+ @token_auth.login_required
+ def get(self, username):
+ """
+ Get detailed stats about a user by OpenStreetMap username
+ ---
+ tags:
+ - users
+ produces:
+ - application/json
+ parameters:
+ - in: header
+ name: Authorization
+ description: Base64 encoded session token
+ required: true
+ type: string
+ default: Token sessionTokenHere==
+ - name: username
+ in: path
+ description: Mapper's OpenStreetMap username
+ required: true
+ type: string
+ default: Thinkwhere
+ - in: query
+ name: team_id
+ description: Team Id
+ required: false
+ type: integer
+ default: null
+ - in: query
+ name: start_date
+ description: Date to filter as minimum
+ required: false
+ type: string
+ default: null
+ - in: query
+ name: end_date
+ description: Date to filter as maximum
+ required: false
+ type: string
+ default: null
+
+ responses:
+ 200:
+ description: User found
+ 401:
+ description: Unauthorized - Invalid credentials
+ 404:
+ description: User not found
+ 500:
+ description: Internal Server Error
+ """
+ try:
+ team_id = int(request.args.get("team_id", 0))
+ start_date = (
+ date_parse(request.args.get("start_date"))
+ if request.args.get("start_date")
+ else None
+ )
+ end_date = (
+ date_parse(request.args.get("end_date"))
+ if request.args.get("end_date")
+ else None
+ )
+ teams_dto = UserService.get_teams_stats(username, start_date=start_date, end_date=end_date, team_id=team_id,)
+
+ return teams_dto.to_primitive(), 200
+ except NotFound:
+ return {"Error": "User not found"}, 404
+ except Exception as e:
+ error_msg = f"User GET - unhandled error: {str(e)}"
+ current_app.logger.critical(error_msg)
+ return {"Error": "Unable to fetch user statistics"}, 500
+
+
+class UserSpecificAPI(Resource):
+ @token_auth.login_required
+ def get(self, username):
+ """
+ Get a list of tasks a user has interacted with
+ ---
+ tags:
+ - users
+ produces:
+ - application/json
+ parameters:
+ - in: header
+ name: Authorization
+ description: Base64 encoded session token
+ required: true
+ type: string
+ default: Token sessionTokenHere==
+ - name: username
+ in: path
+ description: Mapper's OpenStreetMap username
+ required: true
+ type: string
+ default: Thinkwhere
+ - in: query
+ name: status
+ description: Task Status filter mapped/validated
+ required: false
+ type: string
+ default: null
+ - in: query
+ name: start_date
+ description: Date to filter as minimum
+ required: false
+ type: string
+ default: null
+ - in: query
+ name: end_date
+ description: Date to filter as maximum
+ required: false
+ type: string
+ default: null
+ responses:
+ 200:
+ description: Mapped projects found
+ 404:
+ description: No mapped projects found
+ 500:
+ description: Internal Server Error
+ """
+ try:
+ status = request.args.get("status")
+ start_date = (
+ date_parse(request.args.get("start_date"))
+ if request.args.get("start_date")
+ else None
+ )
+ end_date = (
+ date_parse(request.args.get("end_date"))
+ if request.args.get("end_date")
+ else None
+ )
+ tasks = UserService.get_user_specific_task(username, task_status=status, start_date=start_date, end_date=end_date,)
+ return tasks.to_primitive(), 200
+ except NotFound:
+ return {"Error": "User or tasks not found"}, 404
+ except Exception as e:
+ error_msg = f"User GET - unhandled error: {str(e)}"
+ current_app.logger.critical(error_msg)
+ return {"error": error_msg}, 500

backend/models/dtos/user_dto.py

@@ -58,6 +58,7 @@ class UserDTO(Model):
  is_email_verified = EmailType(
  serialized_name="isEmailVerified", serialize_when_none=False
  )
+
  is_expert = BooleanType(serialized_name="isExpert", serialize_when_none=False)
  twitter_id = StringType(serialized_name="twitterId")
  facebook_id = StringType(serialized_name="facebookId")
@@ -125,7 +126,7 @@ class UserContributionDTO(Model):
 
 class UserStatsDTO(Model):
  """ DTO containing statistics about the user """
-
+ 
  total_time_spent = IntType(serialized_name="totalTimeSpent")
  time_spent_mapping = IntType(serialized_name="timeSpentMapping")
  time_spent_validating = IntType(serialized_name="timeSpentValidating")
@@ -145,7 +146,6 @@ class UserStatsDTO(Model):
  ModelType(InterestDTO), serialized_name="ContributionsByInterest"
  )
 
-
 class UserOSMDTO(Model):
  """ DTO containing OSM details for the user """
 
@@ -252,3 +252,20 @@ def __init__(self):
 
  user_tasks = ListType(ModelType(TaskDTO), serialized_name="tasks")
  pagination = ModelType(Pagination)
+
+class UserMappedDTO(Model):
+ """ DTO containing statistics about the user """
+
+ task = ListType(IntType(serialized_name="task"))
+ day = ListType(IntType(serialized_name="day"))
+
+class UserTeamStatsDTO(Model):
+ """ DTO containing statistics about the teams """
+
+ team = ListType(IntType(serialized_name="team"))
+
+
+class UserSpecificDTO(Model):
+ """ DTO containing stats about the user """
+
+ tasks = ListType(IntType(serialized_name="tasks"))