taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #745 from taigaio/detecting-errors-properly-on-points 

Detecting errors properly on points
remotes/origin/issue/4795/notification_even_they_are_disabled
David Barragán Merino 2016-06-02 13:41:23 +02:00
parent a7b3c3099c f3176f4b5a
commit 99ee766781
2 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
taiga/projects/userstories/api.py
View File

@ -16,8 +16,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from contextlib import suppress
from django.apps import apps
from django.db import transaction
from django.utils.translation import ugettext as _
@ -126,18 +124,26 @@ class UserStoryViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixi
super().pre_save(obj)
def post_save(self, obj, created=False):
# Code related to the hack of pre_save method. Rather,
# this is the continuation of it.
Points = apps.get_model("projects", "Points")
RolePoints = apps.get_model("userstories", "RolePoints")
# Code related to the hack of pre_save method. Rather, this is the continuation of it.
if self._role_points:
with suppress(ObjectDoesNotExist):
for role_id, points_id in self._role_points.items():
role_points = RolePoints.objects.get(role__id=role_id, user_story_id=obj.pk)
Points = apps.get_model("projects", "Points")
RolePoints = apps.get_model("userstories", "RolePoints")
for role_id, points_id in self._role_points.items():
try:
role_points = RolePoints.objects.get(role__id=role_id, user_story_id=obj.pk,
role__computable=True)
except (ValueError, RolePoints.DoesNotExist):
raise exc.BadRequest({"points": _("Invalid role id '{role_id}'").format(
role_id=role_id)})
try:
role_points.points = Points.objects.get(id=points_id, project_id=obj.project_id)
role_points.save()
except (ValueError, Points.DoesNotExist):
raise exc.BadRequest({"points": _("Invalid points id '{points_id}'").format(
points_id=points_id)})
role_points.save()
super().post_save(obj, created)

23
tests/integration/test_userstories.py
View File

@ -248,33 +248,42 @@ def test_update_userstory_points(client):
f.PointsFactory.create(project=project, value=1)
points3 = f.PointsFactory.create(project=project, value=2)
us = f.UserStoryFactory.create(project=project, owner=user1, status__project=project, milestone__project=project)
us = f.UserStoryFactory.create(project=project,owner=user1, status__project=project,
milestone__project=project)
usdata = UserStorySerializer(us).data
url = reverse("userstories-detail", args=[us.pk])
client.login(user1)
# Api should ignore invalid values
# invalid role
data = {}
data["version"] = usdata["version"]
data["points"] = copy.copy(usdata["points"])
data["points"].update({'2000': points3.pk})
data["points"].update({"222222": points3.pk})
response = client.json.patch(url, json.dumps(data))
assert response.status_code == 200, str(response.content)
assert response.data["points"] == usdata['points']
assert response.status_code == 400
# invalid point
data = {}
data["version"] = usdata["version"]
data["points"] = copy.copy(usdata["points"])
data["points"].update({str(role1.pk): "999999"})
response = client.json.patch(url, json.dumps(data))
assert response.status_code == 400
# Api should save successful
data = {}
data["version"] = usdata["version"] + 1
data["version"] = usdata["version"]
data["points"] = copy.copy(usdata["points"])
data["points"].update({str(role1.pk): points3.pk})
response = client.json.patch(url, json.dumps(data))
us = models.UserStory.objects.get(pk=us.pk)
usdatanew = UserStorySerializer(us).data
assert response.status_code == 200
assert response.status_code == 200, str(response.content)
assert response.data["points"] == usdatanew['points']
assert response.data["points"] != usdata['points']