Undo schedules using ical cached final data (#5182)

Undo one of the changes from https://github.com/grafana/oncall/pull/5172
(since it seems to make the schedules endpoint a bit worse; OTOH, other
changes improved latency). Eventually we may consider using the cached
on-call users information instead.
This commit is contained in:
Matias Bordese 2024-10-16 10:01:21 -03:00 committed by GitHub
parent 8420cfd822
commit f159a3f72f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 5 deletions

View file

@ -37,7 +37,7 @@ class ScheduleBaseSerializer(EagerLoadingMixin, serializers.ModelSerializer):
"enable_web_overrides",
]
SELECT_RELATED = ["organization"]
SELECT_RELATED = ["organization", "team", "user_group"]
CANT_UPDATE_USER_GROUP_WARNING = (
"Cannot update the user group, make sure to grant user group modification rights to "

View file

@ -15,7 +15,7 @@ class ScheduleBaseSerializer(EagerLoadingMixin, serializers.ModelSerializer):
slack = serializers.DictField(required=False)
team_id = TeamPrimaryKeyRelatedField(required=False, allow_null=True, source="team")
SELECT_RELATED = ["team"]
SELECT_RELATED = ["team", "user_group"]
def create(self, validated_data):
validated_data = self._correct_validated_data(validated_data)
@ -23,9 +23,7 @@ class ScheduleBaseSerializer(EagerLoadingMixin, serializers.ModelSerializer):
return super().create(validated_data)
def get_on_call_now(self, obj):
users_on_call = list_users_to_notify_from_ical(
obj, datetime.datetime.now(datetime.timezone.utc), from_cached_final=True
)
users_on_call = list_users_to_notify_from_ical(obj, datetime.datetime.now(datetime.timezone.utc))
if users_on_call is not None:
return [user.public_primary_key for user in users_on_call]
else: