Skip to content
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.

Sign up for GitHub

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

a fix for duplicate alias problem #3010

Merged
merged 22 commits into from
Oct 27, 2023
Merged

a fix for duplicate alias problem #3010

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
cf2ce74
a fix for duplicate alias problem
godplayer56 Oct 12, 2023
b78811e
This commit corrects the formatting for python files
godplayer56 Oct 16, 2023
9f9b6df
removed the settings.json file
godplayer56 Oct 17, 2023
8f5f13b
adding test for checking duplicate alias
godplayer56 Oct 17, 2023
9cc67e2
fixing formatting errors
godplayer56 Oct 17, 2023
8c5eaec
added two tests and updated rules.py
godplayer56 Oct 18, 2023
450e1ae
changes to rules.py
godplayer56 Oct 19, 2023
e3ed332
added new condition
godplayer56 Oct 19, 2023
898c330
added test for /scheduled_changes/rules
godplayer56 Oct 19, 2023
59bc8a3
corrected formatting error
godplayer56 Oct 19, 2023
e3fb94c
completed the second test
godplayer56 Oct 21, 2023
5ce07b4
trying to fix build errors
godplayer56 Oct 21, 2023
2254047
formatting errors
godplayer56 Oct 21, 2023
c870770
added two more tests with different update types
godplayer56 Oct 23, 2023
7fa4c05
adding exception for tests
godplayer56 Oct 25, 2023
399ee9a
fixing backend test errors
godplayer56 Oct 25, 2023
9051216
added and assertion
godplayer56 Oct 25, 2023
2ca2d73
updated tests
godplayer56 Oct 25, 2023
167b56a
added data_version
godplayer56 Oct 25, 2023
0f6f3cb
tests updated
godplayer56 Oct 25, 2023
c46d589
updated the error message
godplayer56 Oct 25, 2023
aef0681
base_alias -> alias
godplayer56 Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions src/auslib/web/admin/views/rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,24 @@ def _post(self, transaction, changed_by):
if what.get("fallbackMapping") is not None and len(fallback_mapping_values) != 1:
return problem(400, "Bad Request", "Invalid fallbackMapping value. No release name found in DB")

alias = what.get("base_alias", None)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the problem is that in this part of the view this needs to be referred to as alias (not base_alias). I suggest you try printing out what and making a web request to confirm this.

if alias is not None and dbo.rules.getRule(alias):
return problem(400, "Bad Request", "Rule with alias exists")

if alias is not None:
scheduled_rule_with_alias = (
dbo.rules.scheduled_changes.t.select()
.where(
dbo.rules.scheduled_changes.base_alias == alias
and dbo.rules.scheduled_changes.complete is False
and (dbo.rules.scheduled_changes.change_type == "insert" or dbo.rules.scheduled_changes.change_type == "update")
)
.execute()
.fetchall()
)
if len(scheduled_rule_with_alias) > 0:
return problem(400, "Bad Request", "Rule is scheduled with the given alias")

return super(RuleScheduledChangesView, self)._post(what, transaction, changed_by, change_type)


Expand Down Expand Up @@ -318,6 +336,24 @@ def _post(self, sc_id, transaction, changed_by):
if what.get("fallbackMapping") is not None and len(fallback_mapping_values) != 1:
return problem(400, "Bad Request", "Invalid fallbackMapping value. No release name found in DB")

alias = what.get("base_alias", None)
if alias is not None and dbo.rules.getRule(alias):
return problem(400, "Bad Request", "Rule with alias exists")

if alias is not None:
scheduled_rule_with_alias = (
dbo.rules.scheduled_changes.t.select()
.where(
dbo.rules.scheduled_changes.base_alias == alias
and dbo.rules.scheduled_changes.complete is False
and (dbo.rules.scheduled_changes.change_type == "insert" or dbo.rules.scheduled_changes.change_type == "update")
)
.execute()
.fetchall()
)
if len(scheduled_rule_with_alias) > 0:
return problem(400, "Bad Request", "Rule is scheduled with the given alias")

return super(RuleScheduledChangeView, self)._post(sc_id, what, transaction, changed_by, connexion.request.get_json().get("sc_data_version", None))

@requirelogin
Expand Down
140 changes: 140 additions & 0 deletions tests/admin/views/test_rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2238,6 +2238,146 @@ def testAddScheduledChangeMultipleConditions(self):
ret = self._post("scheduled_changes/rules", data=data)
self.assertEqual(ret.status_code, 400)

@mock.patch("time.time", mock.MagicMock(return_value=300))
def testAddScheduledChangesRuleWithDuplicateAliasWithChangeTypeInsert(self):
ret = self._post(
"/rules",
data=dict(backgroundRate=31, mapping="c", priority=33, product="Firefox", update_type="minor", channel="nightly", alias="TestDuplicateAlias1"),
)
self.assertEqual(ret.status_code, 200, "Status Code: %d, Data: %s" % (ret.status_code, ret.get_data()))

data1 = {
"rule_id": 10,
"telemetry_product": None,
"telemetry_channel": None,
"telemetry_uptake": None,
"priority": 80,
"buildTarget": "d",
"version": "3.3",
"backgroundRate": 100,
"mapping": "c",
"update_type": "minor",
"data_version": 1,
"change_type": "insert",
"when": 1234567,
"base_alias": "TestDuplicateAlias1",
}
ret1 = self._post("/scheduled_changes/rules", data=data1)
godplayer56 marked this conversation as resolved.
Show resolved Hide resolved
self.assertEqual(ret1.status_code, 400, ret1.get_data())
load = ret1.get_json()
self.assertEqual(load["detail"], "Rule with alias exists")

@mock.patch("time.time", mock.MagicMock(return_value=300))
def testAddScheduledChangesRuleWithDuplicateAliasWithChangeTypeUpdate(self):
ret = self._post(
"/rules",
data=dict(backgroundRate=31, mapping="c", priority=33, product="Firefox", update_type="minor", channel="nightly", alias="TestDuplicateAlias2"),
)
self.assertEqual(ret.status_code, 200, "Status Code: %d, Data: %s" % (ret.status_code, ret.get_data()))

data1 = {
"rule_id": 10,
"telemetry_product": None,
"telemetry_channel": None,
"telemetry_uptake": None,
"priority": 80,
"buildTarget": "d",
"version": "3.3",
"backgroundRate": 100,
"mapping": "c",
"update_type": "minor",
"data_version": 1,
"change_type": "update",
"when": 1234567,
"base_alias": "TestDuplicateAlias2",
}
ret1 = self._post("/scheduled_changes/rules", data=data1)
self.assertEqual(ret1.status_code, 400, ret1.get_data())
load = ret1.get_json()
self.assertEqual(load["detail"], "Rule with alias exists")

@mock.patch("time.time", mock.MagicMock(return_value=300))
def testAddScheduledChangeWithAliasAlreadyPresentWithChangeTypeInsert(self):
data = {
"rule_id": 5,
"telemetry_product": None,
"telemetry_channel": None,
"telemetry_uptake": None,
"priority": 80,
"buildTarget": "d",
"version": "3.3",
"backgroundRate": 100,
"mapping": "c",
"update_type": "minor",
"data_version": 1,
"change_type": "insert",
"when": 1234567,
"base_alias": "TestDuplicateAlias3",
"complete": False,
}
ret = self._post("/scheduled_changes/rules", data=data)
self.assertEqual(ret.status_code, 200, ret.get_data())

data1 = {
"when": 2000000,
"data_version": 1,
"rule_id": 1,
"priority": 100,
"version": "3.5",
"buildTarget": "d",
"backgroundRate": 100,
"mapping": "c",
"update_type": "minor",
"sc_data_version": 1,
"base_alias": "TestDuplicateAlias3",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also try simulating a request like this on https://localhost:9000/rules/364 by adding an alias and clicking the Save button - take a dlook at what the the Request JSON looks like in the Developer Tools. If it doesn't use base neither should you in these tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got base_alias from the scheduledChangesTable because in some instances it referred to base_alias instead of alias 😅 . Can you provide me with authorization so I can see what a post request looks like?

Copy link
Contributor Author

@godplayer56 godplayer56 Oct 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have updated all the files to use alias instead of base_alias. Though I can't confirm if the issue is now resolved because I don't have authorization for making updates

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should be fully authorized in your local development environment...

In any case, I can assure you that the admin API doesn't use base in these requests.

"complete": False,
}
ret1 = self._post("/scheduled_changes/rules/4", data=data1)
self.assertEqual(ret1.status_code, 400, ret1.get_data())
load = ret1.get_json()
self.assertEqual(load["detail"], "Rule is scheduled with the given alias")

@mock.patch("time.time", mock.MagicMock(return_value=300))
def testAddScheduledChangeWithAliasAlreadyPresentWithChangeTypeUpdate(self):
data = {
"rule_id": 5,
"telemetry_product": None,
"telemetry_channel": None,
"telemetry_uptake": None,
"priority": 80,
"buildTarget": "d",
"version": "3.3",
"backgroundRate": 100,
"mapping": "c",
"update_type": "minor",
"data_version": 1,
"change_type": "update",
"when": 1234567,
"base_alias": "TestDuplicateAlias4",
"complete": False,
}
ret = self._post("/scheduled_changes/rules", data=data)
self.assertEqual(ret.status_code, 200, ret.get_data())

data1 = {
"when": 2000000,
"data_version": 1,
"rule_id": 1,
"priority": 100,
"version": "3.5",
"buildTarget": "d",
"backgroundRate": 100,
"mapping": "c",
"update_type": "minor",
"sc_data_version": 1,
"base_alias": "TestDuplicateAlias4",
"complete": False,
}
ret1 = self._post("/scheduled_changes/rules/4", data=data1)
self.assertEqual(ret1.status_code, 400, ret1.get_data())
load = ret1.get_json()
self.assertEqual(load["detail"], "Rule is scheduled with the given alias")

def testAddScheduledChangeMissingRequiredTelemetryFields(self):
data = {"telemetry_product": "foo", "priority": 120, "backgroundRate": 100, "update_type": "minor", "change_type": "insert"}
ret = self._post("scheduled_changes/rules", data=data)
Expand Down