From 68c556cdf920e110b1ea929de30397e35981c76b Mon Sep 17 00:00:00 2001 From: Rechner Fox <659028+rechner@users.noreply.github.com> Date: Mon, 26 Feb 2024 17:34:21 -0800 Subject: [PATCH 1/2] Update spaceapi sensors to match schema Pre-commit --- memberportal/api_spacedirectory/views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/memberportal/api_spacedirectory/views.py b/memberportal/api_spacedirectory/views.py index 71576587..97d4e14a 100644 --- a/memberportal/api_spacedirectory/views.py +++ b/memberportal/api_spacedirectory/views.py @@ -60,7 +60,7 @@ def get(self, request): ## Setup the basic details sensor_details = { "name": sensor.name, - "description": sensor.description, + "description": sensor.description or "", "location": sensor.location, } @@ -83,11 +83,11 @@ def get(self, request): signout_date=None ).order_by("-signin_date") - sensor_data["total_member_count"] = {"value": spaceapi_user_count} + sensor_data["total_member_count"] = [{"value": spaceapi_user_count}] - sensor_data["people_now_present"] = { - "value": spaceapi_members_on_site.count() - } + sensor_data["people_now_present"] = [ + {"value": spaceapi_members_on_site.count()} + ] # Is the camera array empty? If not, add them if not config.SPACE_DIRECTORY_CAMS: From 47e6c6c488a0c9f3f00cb6969e4396fd10225749 Mon Sep 17 00:00:00 2001 From: Jaimyn Mayer Date: Fri, 2 Feb 2024 14:59:13 +1000 Subject: [PATCH 2/2] v3.6.2 --- CHANGELOG.md | 26 +++++++++++++++++++++----- package.json | 2 +- src-frontend/package.json | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f79a5707..3d33dbb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,22 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v3.6.2] - 2024-02-02 + +### Fixed + +- SpaceAPI return type for version number (thanks @rechner) + +### Added + +- New OIDC scope called `membershipinfo` and extra claims +- New GitHub Actions for checks and docker build on every PR + +### Changed + +- Cleaned up some old code/models +- Tidied up redundant staff/admin attributes + ## [v3.6.1] - 2024-01-20 ### Fixed @@ -543,11 +559,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - First run detection and fixture loading. - Added a handful of missing translation definitions. - Corner/border formatting with credit card component. -- https://github.com/membermatters/MemberMatters/issues/90 -- https://github.com/membermatters/MemberMatters/issues/91 -- https://github.com/membermatters/MemberMatters/issues/92 -- https://github.com/membermatters/MemberMatters/issues/93 -- https://github.com/membermatters/MemberMatters/issues/101 +- +- +- +- +- ## Versions prior to v2.1.0 don't have changelog entries diff --git a/package.json b/package.json index 42a694ca..52710f3c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "membermatters", - "version": "3.6.1", + "version": "3.6.2", "devDependencies": { "eslint-webpack-plugin": "^3.1.1", "husky": "^6.0.0", diff --git a/src-frontend/package.json b/src-frontend/package.json index 93fbcae2..53683727 100644 --- a/src-frontend/package.json +++ b/src-frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "3.6.1", + "version": "3.6.2", "description": "The MemberMatters frontend", "productName": "MemberMatters", "author": "Jaimyn Mayer ",