Skip to content

Allow adding service environment to existing service #3924

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

Merged
hipek8 merged 2 commits into from
Dec 9, 2025
Merged

Allow adding service environment to existing service #3924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6498d3
Allow adding service environment to existing service
hipek8 Dec 9, 2025
ca50442
Fix tests
hipek8 Dec 9, 2025
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
2 changes: 0 additions & 2 deletions src/ralph/assets/api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ class Meta:
queryset = models.ServiceEnvironment.objects.all()
serializer_class = serializers.ServiceEnvironmentSerializer
select_related = ["service", "environment", "service__support_team"]
# allow to only add environments through service resource
http_method_names = ["get", "delete"]
prefetch_related = ["tags"] + [
"service__{}".format(pr) for pr in ServiceViewSet.prefetch_related
]
Expand Down
10 changes: 5 additions & 5 deletions src/ralph/assets/tests/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,24 +315,24 @@ def test_get_service_environment(self):
self.assertEqual(response.data["service"]["id"], service_env.service.id)
self.assertEqual(response.data["environment"]["id"], service_env.environment.id)

def test_create_service_should_return_method_not_allowed(self):
def test_create_service_environment(self):
url = reverse("serviceenvironment-list")
data = {
"service": self.services[0].id,
"environment": self.envs[0].id,
"environment": self.envs[1].id,
}
response = self.client.post(url, data, format="json")
self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
self.assertEqual(response.status_code, status.HTTP_201_CREATED)

def test_patch_service_should_return_method_not_allowed(self):
def test_patch_service_environment(self):
service_env = ServiceEnvironment.objects.all()[0]
url = reverse("serviceenvironment-detail", args=(service_env.id,))
data = {
"service": self.services[0].id,
"environment": self.envs[0].id,
}
response = self.client.patch(url, data, format="json")
self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
self.assertEqual(response.status_code, status.HTTP_200_OK)


class ProfitCenterAPITests(RalphAPITestCase):
Expand Down
34 changes: 20 additions & 14 deletions src/ralph/supports/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ class Meta:
class BackOfficeAssetForSupportSerializer(RalphAPISerializer):
id = serializers.IntegerField(source="pk")
model = serializers.CharField(source="model.name", read_only=True)
manufacturer = serializers.CharField(source="model.manufacturer.name", read_only=True)
manufacturer = serializers.CharField(
source="model.manufacturer.name", read_only=True
)
category = serializers.CharField(source="model.category.name", read_only=True)
service_env = ServiceEnvironmentSimpleSerializer(read_only=True)
property_of = serializers.CharField(source="property_of.name", read_only=True)
Expand Down Expand Up @@ -80,7 +82,9 @@ class Meta:
class DataCenterAssetForSupportSerializer(RalphAPISerializer):
id = serializers.IntegerField(source="pk")
model = serializers.CharField(source="model.name", read_only=True)
manufacturer = serializers.CharField(source="model.manufacturer.name", read_only=True)
manufacturer = serializers.CharField(
source="model.manufacturer.name", read_only=True
)
category = serializers.CharField(source="model.category.name", read_only=True)
service_env = ServiceEnvironmentSimpleSerializer(read_only=True)
property_of = serializers.CharField(source="property_of.name", read_only=True)
Expand Down Expand Up @@ -113,11 +117,11 @@ class SupportSerializer(TypeFromContentTypeSerializerMixin, RalphAPISerializer):
datacenter_assets = serializers.SerializerMethodField()

def get_base_objects(self, obj):
request = self.context.get('request')
request = self.context.get("request")
base_objects = [bos.baseobject for bos in obj.baseobjectssupport_set.all()]
return [
request.build_absolute_uri(
reverse('baseobject-detail', kwargs={'pk': bo.pk})
reverse("baseobject-detail", kwargs={"pk": bo.pk})
)
for bo in base_objects
]
Expand All @@ -129,34 +133,36 @@ class Meta:

def get_fields(self):
fields = super().get_fields()
request = self.context.get('request')
if request and not request.query_params.get('include_assets'):
fields.pop('backoffice_assets', None)
fields.pop('datacenter_assets', None)
request = self.context.get("request")
if request and not request.query_params.get("include_assets"):
fields.pop("backoffice_assets", None)
fields.pop("datacenter_assets", None)
return fields

def get_backoffice_assets(self, obj):
request = self.context.get('request')
if not request or not request.query_params.get('include_assets'):
request = self.context.get("request")
if not request or not request.query_params.get("include_assets"):
return []

backoffice_ct_id = ContentType.objects.get_for_model(BackOfficeAsset).id

backoffice_assets = [
bos.baseobject for bos in obj.baseobjectssupport_set.all()
bos.baseobject
for bos in obj.baseobjectssupport_set.all()
if bos.baseobject.content_type_id == backoffice_ct_id
]
return BackOfficeAssetForSupportSerializer(backoffice_assets, many=True).data

def get_datacenter_assets(self, obj):
request = self.context.get('request')
if not request or not request.query_params.get('include_assets'):
request = self.context.get("request")
if not request or not request.query_params.get("include_assets"):
return []

datacenter_ct_id = ContentType.objects.get_for_model(DataCenterAsset).id

datacenter_assets = [
bos.baseobject for bos in obj.baseobjectssupport_set.all()
bos.baseobject
for bos in obj.baseobjectssupport_set.all()
if bos.baseobject.content_type_id == datacenter_ct_id
]
return DataCenterAssetForSupportSerializer(datacenter_assets, many=True).data
Expand Down
8 changes: 4 additions & 4 deletions src/ralph/supports/tests/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@ def test_support_with_include_assets(self):
url = reverse("support-list")

with self.assertQueriesMoreOrLess(7, plus_minus=2):
response = self.client.get(
url, {"include_assets": "true"}, format="json"
)
response = self.client.get(url, {"include_assets": "true"}, format="json")

self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data["count"], 15) # 4 with assets + 10 without + 1 from setUp
self.assertEqual(
response.data["count"], 15
) # 4 with assets + 10 without + 1 from setUp

for result in response.data["results"]:
if result["name"] == "support_with_assets_1":
Expand Down