-
Notifications
You must be signed in to change notification settings - Fork 116
feat: Update useSerialLogs to accept URL params #5674
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -427,3 +427,142 @@ def test_get_serial_log_general_error(self, mock_get_serial_log): | |
| self.assertEqual(response.status_code, 500) | ||
| self.assertFalse(data["success"]) | ||
| self.assertEqual(data["message"], "Internal server error") | ||
|
|
||
| @patch( | ||
| "canonicalwebteam.store_api.publishergw.PublisherGW" | ||
| + ".get_store_model_serial_logs" | ||
| ) | ||
| def test_get_serial_log_with_time_range(self, mock_get_serial_log): | ||
| mock_serial_log = [] | ||
| mock_get_serial_log.return_value = mock_serial_log | ||
| response = self.client.get( | ||
| "/api/store/1/models/test-model/serial-log" | ||
| "?start-time=2026-06-01T00:00:00Z" | ||
| "&end-time=2026-06-30T23:59:59Z" | ||
| ) | ||
|
steverydz marked this conversation as resolved.
|
||
| data = response.json | ||
|
|
||
| self.assertEqual(response.status_code, 200) | ||
| self.assertTrue(data["success"]) | ||
| self.assertEqual(data["data"], []) | ||
|
|
||
| mock_get_serial_log.assert_called_once() | ||
| # Arguments are passed positionally: | ||
| # (session, store_id, model_name, start_time, end_time, page_size) | ||
|
Comment on lines
+450
to
+451
|
||
| self.assertEqual( | ||
| mock_get_serial_log.call_args.args[3], | ||
| "2026-06-01T00:00:00Z", | ||
| ) | ||
| self.assertEqual( | ||
| mock_get_serial_log.call_args.args[4], | ||
| "2026-06-30T23:59:59Z", | ||
| ) | ||
|
|
||
| @patch( | ||
| "canonicalwebteam.store_api.publishergw.PublisherGW" | ||
| + ".get_store_model_serial_logs" | ||
| ) | ||
| def test_get_serial_log_with_page_size(self, mock_get_serial_log): | ||
| mock_serial_log = [ | ||
| { | ||
| "brand-id": "test-brand-id", | ||
| "created-at": "2026-03-23T04:00:23.875000", | ||
| "model-name": "test-model", | ||
| "serial": "test-serial", | ||
| } | ||
| ] | ||
| mock_get_serial_log.return_value = mock_serial_log | ||
| response = self.client.get( | ||
| "/api/store/1/models/test-model/serial-log?page-size=50" | ||
| ) | ||
| data = response.json | ||
|
steverydz marked this conversation as resolved.
|
||
|
|
||
| self.assertEqual(response.status_code, 200) | ||
| self.assertTrue(data["success"]) | ||
| self.assertEqual(data["data"], mock_serial_log) | ||
|
|
||
| mock_get_serial_log.assert_called_once() | ||
| # Arguments are passed positionally: | ||
| # session, store_id, model_name, start_time, | ||
| # end_time, page_size, cursor | ||
| self.assertEqual( | ||
| mock_get_serial_log.call_args.args[5], | ||
| "50", | ||
| ) | ||
|
|
||
| @patch( | ||
| "canonicalwebteam.store_api.publishergw.PublisherGW" | ||
| + ".get_store_model_serial_logs" | ||
| ) | ||
| def test_get_serial_log_with_next_page(self, mock_get_serial_log): | ||
| mock_serial_log = [ | ||
| { | ||
| "brand-id": "test-brand-id", | ||
| "created-at": "2026-03-23T04:00:23.875000", | ||
| "model-name": "test-model", | ||
| "serial": "test-serial", | ||
| } | ||
| ] | ||
| mock_get_serial_log.return_value = mock_serial_log | ||
| response = self.client.get( | ||
| "/api/store/1/models/test-model/serial-log?next-page=nextpage" | ||
| ) | ||
| data = response.json | ||
|
|
||
| self.assertEqual(response.status_code, 200) | ||
| self.assertTrue(data["success"]) | ||
| self.assertEqual(data["data"], mock_serial_log) | ||
|
|
||
| mock_get_serial_log.assert_called_once() | ||
| # Arguments are passed positionally: | ||
| # session, store_id, model_name, start_time, | ||
| # end_time, page_size, cursor | ||
| self.assertEqual( | ||
| mock_get_serial_log.call_args.args[6], | ||
| "nextpage", | ||
| ) | ||
|
Comment on lines
+516
to
+523
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. bad suggestion IMO, I feel like this would make the test more brittle and difficult to read |
||
|
|
||
| @patch( | ||
| "canonicalwebteam.store_api.publishergw.PublisherGW" | ||
| + ".get_store_model_serial_logs" | ||
| ) | ||
| def test_get_serial_log_with_all_parameters(self, mock_get_serial_log): | ||
| mock_serial_log = [ | ||
| { | ||
| "brand-id": "test-brand-id", | ||
| "created-at": "2026-03-23T04:00:23.875000", | ||
| "model-name": "test-model", | ||
| "serial": "test-serial", | ||
| } | ||
| ] | ||
| mock_get_serial_log.return_value = mock_serial_log | ||
| response = self.client.get( | ||
| "/api/store/1/models/test-model/serial-log" | ||
| "?start-time=2026-01-01T00:00:00Z" | ||
| "&end-time=2026-12-31T23:59:59Z" | ||
| "&page-size=25" | ||
| "&next-page=nextpage" | ||
| ) | ||
|
steverydz marked this conversation as resolved.
|
||
| data = response.json | ||
|
|
||
| self.assertEqual(response.status_code, 200) | ||
| self.assertTrue(data["success"]) | ||
| self.assertEqual(data["data"], mock_serial_log) | ||
|
|
||
| mock_get_serial_log.assert_called_once() | ||
| # Arguments are passed positionally: | ||
| # session, store_id, model_name, start_time, | ||
| # end_time, page_size, cursor | ||
| self.assertEqual( | ||
| mock_get_serial_log.call_args.args[3], | ||
| "2026-01-01T00:00:00Z", | ||
| ) | ||
| self.assertEqual( | ||
| mock_get_serial_log.call_args.args[4], | ||
| "2026-12-31T23:59:59Z", | ||
| ) | ||
| self.assertEqual( | ||
| mock_get_serial_log.call_args.args[5], | ||
| "25", | ||
| ) | ||
| self.assertEqual(mock_get_serial_log.call_args.args[6], "nextpage") | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -353,13 +353,21 @@ def create_remodel_allowlist(store_id: str): | |
| @login_required | ||
| @exchange_required | ||
| def get_serial_log(store_id: str, model_name: str): | ||
| start_time = flask.request.args.get("start-time") | ||
| end_time = flask.request.args.get("end-time") | ||
| page_size = flask.request.args.get("page-size") | ||
| cursor = flask.request.args.get("next-page") | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Any reason why we rename
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @bartaz This is for clarity for the frontend as |
||
| res = {} | ||
|
|
||
|
steverydz marked this conversation as resolved.
|
||
| try: | ||
| logs = publisher_gateway.get_store_model_serial_logs( | ||
| flask.session, | ||
| store_id, | ||
| model_name, | ||
| start_time, | ||
| end_time, | ||
| page_size, | ||
| cursor, | ||
|
steverydz marked this conversation as resolved.
|
||
| ) | ||
| res["data"] = logs | ||
| res["success"] = True | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.