Skip to content

#166575309 assets in workspace #328

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.

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions api/serializers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
OfficeWorkspaceSerializer,
TeamDetailedSerializer,
TeamSerializer,
OfficeWorkspaceDetailSerializer,
)
from .assets import ( # noqa: F401 # isort:skip
AllocationsSerializer,
Expand Down
33 changes: 31 additions & 2 deletions api/serializers/andela_centres.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,35 @@ def get_long_name(self, obj):
return long_name


class OfficeWorkspaceDetailSerializer(serializers.ModelSerializer):
assets_assigned = serializers.SerializerMethodField()

class Meta:
model = models.OfficeWorkspace
fields = ("id", "name", "floor", "block", "workspaces", "assets_assigned")

def get_assets_assigned(self, obj):
"""This method returns assets assigned to a particuluar workspace
Args:
obj (object): current object instance being fetched
Returns:
json : serialized assets belonging to the specified workspace
"""

from api.serializers.assets import WorkspaceAssetSerializer

workspace_assigned = models.AssetAssignee.objects.filter(
asset_location_id=obj.id
).first()
assets = models.Asset.objects.filter(assigned_to=workspace_assigned)
page = self.context["view"].paginate_queryset(assets)
serialized_assets = WorkspaceAssetSerializer(page, many=True)
paginated_assets = self.context["view"].get_paginated_response(
serialized_assets.data
)
return paginated_assets.data


class DepartmentSerializer(serializers.ModelSerializer):
number_of_assets = serializers.SerializerMethodField()

Expand Down Expand Up @@ -204,7 +233,7 @@ class Meta:
class TeamSerializer(serializers.ModelSerializer):
class Meta:
model = models.DepartmentalTeam
fields = ('name', 'description', 'department')
fields = ("name", "description", "department")


class TeamDetailedSerializer(serializers.ModelSerializer):
Expand All @@ -214,7 +243,7 @@ class TeamDetailedSerializer(serializers.ModelSerializer):

class Meta:
model = models.DepartmentalTeam
fields = ('name', 'description', 'department', 'members', 'assets_assigned')
fields = ("name", "description", "department", "members", "assets_assigned")

def get_assets_assigned(self, obj):
"""
Expand Down
8 changes: 8 additions & 0 deletions api/serializers/assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -577,3 +577,11 @@ class Meta:
"incident_report_state",
"asset_state_from_report",
)


class WorkspaceAssetSerializer(serializers.ModelSerializer):
asset_type = serializers.ReadOnlyField()

class Meta:
model = models.Asset
fields = ("uuid", "asset_category", "serial_number", "asset_code", "asset_type")
2 changes: 2 additions & 0 deletions api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
OfficeBlockViewSet,
OfficeFloorSectionViewSet,
OfficeFloorViewSet,
OfficeWorkspaceDetailViewSet,
OfficeWorkspaceViewSet,
SecurityUserViewSet,
StateTransitionViewset,
Expand Down Expand Up @@ -86,6 +87,7 @@ def __init__(self, trailing_slash="/?"):
router.register("asset-types", AssetTypeViewSet, "asset-types")
router.register("incidence-reports", AssetIncidentReportViewSet, "incidence-reports")
router.register("manage-assets", ManageAssetViewSet, "manage-assets")
router.register("workspace-detail", OfficeWorkspaceDetailViewSet, "workspace-detail")
router.register(
"slack-incidence-reports",
AssetSlackIncidentReportViewSet,
Expand Down
16 changes: 16 additions & 0 deletions api/views/andela_centres.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
OfficeFloorSectionDetailSerializer,
OfficeFloorSectionSerializer,
OfficeFloorSerializer,
OfficeWorkspaceDetailSerializer,
OfficeWorkspaceSerializer,
)
from api.serializers.andela_centres import TeamDetailedSerializer, TeamSerializer
Expand Down Expand Up @@ -128,6 +129,11 @@ class OfficeWorkspaceViewSet(ModelViewSet):
permission_classes = [IsAuthenticated, IsAdminUser]
authentication_classes = [FirebaseTokenAuthentication]

def get_serializer_class(self):
if self.action == "retrieve":
return OfficeWorkspaceDetailSerializer
return OfficeWorkspaceSerializer

def destroy(self, request, *args, **kwargs):
instance = self.get_object()
self.perform_destroy(instance)
Expand Down Expand Up @@ -162,3 +168,13 @@ def get_serializer_class(self):
if self.action == "retrieve":
return TeamDetailedSerializer
return TeamSerializer


class OfficeWorkspaceDetailViewSet(ModelViewSet):
serializer_class = OfficeWorkspaceDetailSerializer
queryset = models.OfficeWorkspace.objects.all()
permission_classes = [IsAuthenticated, IsAdminUser]
authentication_classes = [FirebaseTokenAuthentication]

def get_serializer_class(self):
return OfficeWorkspaceDetailSerializer