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

Jump to bottom

Unify "name" and "title" field for oncall shift #2239

Merged
merged 1 commit into from
Jun 14, 2023
Merged

Unify "name" and "title" field for oncall shift #2239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions engine/apps/api/serializers/on_call_shifts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,15 @@ class OnCallShiftSerializer(EagerLoadingMixin, serializers.ModelSerializer):
), # todo: filter by team?
)
updated_shift = serializers.CharField(read_only=True, allow_null=True, source="updated_shift.public_primary_key")
# Name is optional to keep backward compatibility with older frontends
name = serializers.CharField(required=False)

class Meta:
model = CustomOnCallShift
fields = [
"id",
"organization",
"title",
"name",
"type",
"schedule",
"priority_level",
Expand Down Expand Up @@ -196,9 +198,7 @@ def _require_users(self, validated_data):

def create(self, validated_data):
validated_data = self._correct_validated_data(validated_data["type"], validated_data)
validated_data["name"] = CustomOnCallShift.generate_name(
validated_data["schedule"], validated_data["priority_level"], validated_data["type"]
)

# before creation, require users set
self._require_users(validated_data)
instance = super().create(validated_data)
Expand All @@ -216,16 +216,16 @@ class Meta(OnCallShiftSerializer.Meta):

def update(self, instance, validated_data):
validated_data = self._correct_validated_data(instance.type, validated_data)
change_only_title = True
change_only_name = True
create_or_update_last_shift = False
force_update = validated_data.pop("force_update", True)

for field in validated_data:
if field != "title" and validated_data[field] != getattr(instance, field):
change_only_title = False
if field != "name" and validated_data[field] != getattr(instance, field):
change_only_name = False
break

if not change_only_title:
if not change_only_name:
if instance.type != CustomOnCallShift.TYPE_OVERRIDE:
if instance.event_is_started:
create_or_update_last_shift = True
Expand Down
Loading