tenancy/models.py

@@ -137,16 +137,28 @@ class TenancyShotRequestInfo(BaseModelMixin):

                             shot = TenancyShotInfo.objects.get(shot_id=self.shot_id)
              

                         except TenancyShotInfo.DoesNotExist:
              

                             shot = None
              

                +        
              

                +        try:
              

                +            model = ModelInfo.objects.get(model_id=self.model_id, status=True)
              

                +        except ModelInfo.DoesNotExist:
              

                +            model = None
              

                +
              

                         return {
              

                             'req_id': self.request_id,
              

                             'request_id': self.request_id,
              

                             'shot_id': self.shot_id,
              

                +            'model_info': model.admindata,
              

                             'shot_info': shot.data if shot else {},
              

                             'front_cap_status': self.front_cap_status,
              

                             'rear_cap_status': self.rear_cap_status,
              

                             'lens_hood_status': self.lens_hood_status,
              

                             'tripod_ring_status': self.tripod_ring_status,
              

                             'appearance_performance_status': self.appearance_performance_status,
              

                +            'front_cap_status': self.front_cap_status,
              

                +            'rear_cap_status': self.rear_cap_status,
              

                +            'lens_hood_status': self.lens_hood_status,
              

                +            'tripod_ring_status': self.tripod_ring_status,
              

                +            'appearance_performance_status': self.appearance_performance_status,
              

                             'user_id': self.user_id,
              

                             'name': self.name,
              

                             'phone': self.phone,