Merge pull request #105 from observatorycontrolsystem/remove-shims

Clean up blocks and userrequests

observation_portal/observations/time_accounting.py

@@ -47,7 +47,7 @@ def on_summary_update_time_accounting(current, instance):
 
 
 def configuration_time_used(summary, observation_type):
-    """ Calculates the block bounded time completed for time accounting purposes """
+    """ Calculates the observation bounded time completed for time accounting purposes """
     configuration_time = timedelta(seconds=0)
     configuration_time += summary.end - summary.start
 

observation_portal/observations/viewsets.py

@@ -116,7 +116,7 @@ def create(self, request, *args, **kwargs):
         """
         cache_key = 'observation_portal_last_schedule_time'
         if not isinstance(request.data, list):
-            # Just do the default create for the single block case
+            # Just do the default create for the single observation case
             created_obs = super().create(request, args, kwargs)
             site = request.data['site']
             cache.set(cache_key + f"_{site}", timezone.now(), None)

observation_portal/requestgroups/test/test_api.py

@@ -13,11 +13,9 @@
 from observation_portal.common import state_changes
 
 from observation_portal.requestgroups.contention import Pressure
-from observation_portal.accounts.models import Profile
 from observation_portal.accounts.test_utils import blend_user
 
 from django.urls import reverse
-from django.contrib.auth.models import User
 from django.core import cache
 from dateutil.parser import parse as datetime_parser
 from rest_framework.test import APITestCase
@@ -26,7 +24,6 @@
 from datetime import datetime, timedelta
 import copy
 import random
-from unittest import skip
 from unittest.mock import patch
 
 generic_payload = {
@@ -2257,100 +2254,6 @@ def test_cannot_cancel_completed_rg(self, modify_mock):
         self.assertEqual(Request.objects.get(pk=completed_r.id).state, 'COMPLETED')
 
 
-@patch('observation_portal.common.state_changes.modify_ipp_time_from_requests')
-class TestUpdateRequestStatesAPI(APITestCase):
-    def setUp(self):
-        self.user = blend_user(user_params={'is_staff': True})
-        self.proposal = mixer.blend(Proposal)
-        mixer.blend(Membership, user=self.user, proposal=self.proposal)
-        self.client.force_login(self.user)
-        self.rg = mixer.blend(RequestGroup, operator='MANY', state='PENDING', proposal=self.proposal,
-                              modified=timezone.now() - timedelta(weeks=2), observation_type=RequestGroup.NORMAL)
-        self.requests = mixer.cycle(3).blend(Request, request_group=self.rg, state='PENDING', modified=timezone.now() - timedelta(weeks=2))
-
-    ## TODO update to remove mocked lake stuff
-    # @responses.activate
-    # def test_no_pond_blocks_no_state_changed(self, modify_mock):
-    #     pond_blocks = []
-    #     now = timezone.now()
-    #     mixer.cycle(3).blend(Window, request=(r for r in self.requests), start=now - timedelta(days=2),
-    #                          end=now + timedelta(days=1))
-    #
-    #     responses.add(responses.GET, 'http://configdbdev.lco.gtn' + '/blocks/',
-    #             json={'next': None, 'results': pond_blocks}, status=200)
-    #     one_week_ahead = timezone.now() + timedelta(weeks=1)
-    #     response = self.client.get(reverse('api:isDirty') + '?last_query_time=' + parse.quote(one_week_ahead.isoformat()))
-    #     response_json = response.json()
-    #
-    #     self.assertFalse(response_json['isDirty'])
-    #
-    # @responses.activate
-    # def test_pond_blocks_no_state_changed(self, modify_mock):
-    #     now = timezone.now()
-    #     mixer.cycle(3).blend(Window, request=(r for r in self.requests), start=now - timedelta(days=2),
-    #                          end=now + timedelta(days=1))
-    #     molecules1 = basic_mixer.cycle(3).blend(PondMolecule, completed=False, failed=False, request_num=self.requests[0].id,
-    #                                             tracking_num=self.rg.id, events=[])
-    #     molecules2 = basic_mixer.cycle(3).blend(PondMolecule, completed=False, failed=False, request_num=self.requests[1].id,
-    #                                             tracking_num=self.rg.id, events=[])
-    #     molecules3 = basic_mixer.cycle(3).blend(PondMolecule, completed=False, failed=False, request_num=self.requests[2].id,
-    #                                             tracking_num=self.rg.id, events=[])
-    #     pond_blocks = basic_mixer.cycle(3).blend(PondBlock, molecules=(m for m in [molecules1, molecules2, molecules3]),
-    #                                              start=now + timedelta(minutes=30), end=now + timedelta(minutes=40))
-    #     pond_blocks = [pb._to_dict() for pb in pond_blocks]
-    #     responses.add(responses.GET, 'http://configdbdev.lco.gtn' + '/blocks/',
-    #             json={'next': None, 'results': pond_blocks}, status=200)
-    #
-    #     one_week_ahead = timezone.now() + timedelta(weeks=1)
-    #     response = self.client.get(reverse('api:isDirty') + '?last_query_time=' + parse.quote(one_week_ahead.isoformat()))
-    #     response_json = response.json()
-    #
-    #     self.assertFalse(response_json['isDirty'])
-    #     for i, req in enumerate(self.requests):
-    #         req.refresh_from_db()
-    #         self.assertEqual(req.state, 'PENDING')
-    #     self.rg.refresh_from_db()
-    #     self.assertEqual(self.rg.state, 'PENDING')
-    #
-    # @responses.activate
-    # def test_pond_blocks_state_change_completed(self, modify_mock):
-    #     now = timezone.now()
-    #     mixer.cycle(3).blend(Window, request=(r for r in self.requests), start=now - timedelta(days=2),
-    #                          end=now - timedelta(days=1))
-    #     molecules1 = basic_mixer.cycle(3).blend(PondMolecule, completed=True, failed=False, request_num=self.requests[0].id,
-    #                                             tracking_num=self.rg.id, events=[])
-    #     molecules2 = basic_mixer.cycle(3).blend(PondMolecule, completed=False, failed=False, request_num=self.requests[1].id,
-    #                                             tracking_num=self.rg.id, events=[])
-    #     molecules3 = basic_mixer.cycle(3).blend(PondMolecule, completed=False, failed=False, request_num=self.requests[2].id,
-    #                                             tracking_num=self.rg.id, events=[])
-    #     pond_blocks = basic_mixer.cycle(3).blend(PondBlock, molecules=(m for m in [molecules1, molecules2, molecules3]),
-    #                                              start=now - timedelta(minutes=30), end=now - timedelta(minutes=20))
-    #     pond_blocks = [pb._to_dict() for pb in pond_blocks]
-    #     responses.add(responses.GET, 'http://configdbdev.lco.gtn' + '/blocks/',
-    #             json={'next': None, 'results': pond_blocks}, status=200)
-    #
-    #     response = self.client.get(reverse('api:isDirty'))
-    #     response_json = response.json()
-    #
-    #     self.assertTrue(response_json['isDirty'])
-    #
-    #     request_states = ['COMPLETED', 'WINDOW_EXPIRED', 'WINDOW_EXPIRED']
-    #     for i, req in enumerate(self.requests):
-    #         req.refresh_from_db()
-    #         self.assertEqual(req.state, request_states[i])
-    #     self.rg.refresh_from_db()
-    #     self.assertEqual(self.rg.state, 'COMPLETED')
-    #
-    # @responses.activate
-    # def test_bad_data_from_pond(self, modify_mock):
-    #     responses.add(responses.GET, 'http://configdbdev.lco.gtn' + '/blocks/',
-    #                   body='Internal Server Error', status=500, content_type='application/json')
-    #
-    #     response = self.client.get(reverse('api:isDirty'))
-    #
-    #     self.assertEqual(response.status_code, 500)
-
-
 @patch('observation_portal.common.state_changes.modify_ipp_time_from_requests')
 class TestSchedulableRequestsApi(SetTimeMixin, APITestCase):
     def setUp(self):

observation_portal/settings.py

@@ -59,8 +59,6 @@
     'django_dramatiq',
     'observation_portal.accounts.apps.AccountsConfig',
     'observation_portal.requestgroups.apps.RequestGroupsConfig',
-    'observation_portal.userrequests.apps.UserRequestsConfig',
-    'observation_portal.blocks.apps.BlocksConfig',
     'observation_portal.observations.apps.ObservationsConfig',
     'observation_portal.proposals.apps.ProposalsConfig',
     'observation_portal.sciapplications.apps.SciapplicationsConfig',

observation_portal/urls.py

@@ -26,8 +26,6 @@
 from django.conf.urls.static import static
 
 from observation_portal.requestgroups.viewsets import RequestGroupViewSet, RequestViewSet, DraftRequestGroupViewSet
-from observation_portal.userrequests.viewsets import UserRequestViewSet
-from observation_portal.blocks.viewsets import PondBlockViewSet
 from observation_portal.requestgroups.views import TelescopeStatesView, TelescopeAvailabilityView, AirmassView
 from observation_portal.requestgroups.views import InstrumentsInformationView, ObservationPortalLastChangedView
 from observation_portal.requestgroups.views import ContentionView, PressureView
@@ -45,8 +43,6 @@
 router = DefaultRouter()
 router.register(r'requests', RequestViewSet, 'requests')
 router.register(r'requestgroups', RequestGroupViewSet, 'request_groups')
-router.register(r'userrequests', UserRequestViewSet, 'userrequests')
-router.register(r'blocks', PondBlockViewSet, 'blocks')
 router.register(r'drafts', DraftRequestGroupViewSet, 'drafts')
 router.register(r'proposals', ProposalViewSet, 'proposals')
 router.register(r'semesters', SemesterViewSet, 'semesters')