Hotfix/unit test fixes (#517)

* chore(unit-tests): save db operations

* chore(ci): add missing unit tests OAuth2AttendeesApiTest and OAuth2SummitSponsorApiTest
chore(unit-test): fix OAuth2SummitSponsorApiTest
chore(unit-test): fix OAuth2AttendeesApiTest

* chore(unit-tests): fix deprecation warnings on phpunit test

* chore(unit-test): fix OAuth2BookableRoomAttributeTypesApiTest
chore(ci): add to OAuth2BookableRoomAttributeTypesApiTest

* chore(ci): add OAuth2CompaniesApiTest

* chore(unit-test): remove obsolete test

* chore(unit-test): fix OAuth2ElectionsApiController
chore(ci): add OAuth2ElectionsApiController

* chore(unit-test): add missing test methods to OAuth2ElectionApiTest

* chore(unit-test): fix OAuth2MembersApiTest
chore(ci): add OAuth2MembersApiTest

* chore(unit-test): add missing tests to OAuth2MembersApiTest

* chore(ci): add OAuth2GroupsApiTest

* chore(ci): add OAuth2OAuth2SponsorshipTypeApiTest
chore(unit-test): fix OAuth2OAuth2SponsorshipTypeApiTest

* chore(ci): add OAuth2OrganizationsApiTest
chore(unit-test): fix OAuth2OrganizationsApiTest

* chore(unit-test): add OAuth2PresentationApiTest
chore(ci): add OAuth2PresentationApiTest

* chore(ci): fix typo

* chore(unit-tests): add missing coverage

* chore(ci): add OAuth2PromoCodesApiTest
chore(ci): add OAuth2SummitPromoCodesApiTest
chore(unit-test): fix OAuth2PromoCodesApiTest and OAuth2SummitPromoCodesApiTest

* chore(unit-tests): fix OAuth2SelectionPlansApiTest
chore(ci): add OAuth2SelectionPlansApiTest

* chore(unit-tests): fix OAuth2SummitSpeakersApiTest
chore(ci): add OAuth2SummitSpeakersApiTest

* chore(unit-tests): fix OAuth2SummitBadgesApiTest
chore(ci): add OAuth2SummitBadgesApiTest

* chore(unit-tests): fix OAuth2TracksApiTest
chore(ci): add OAuth2TracksApiTest

* chore(unit-tests): fix OAuth2TrackTagGroupsApiTest
chore(ci): add OAuth2TrackTagGroupsApiTest

* chore(unit-tests): fix OAuth2SummitTracksApiTest
chore(ci): add OAuth2SummitTracksApiTest and OAuth2TagsApiTest

* chore(unit-tests): fix several unit tests
chore(ci): add several unit tests to GA

* chore(unit-tests): fix several tests

* OAuth2SummitTicketTypesApiTest
* OAuth2SummitTicketsApiTest
* OAuth2SummitTaxTypeApiTest
* OAuth2TrackGroupsApiTest
* OAuth2TrackQuestionsTemplateTest

* chore(unit-tests): fix several unit tests

OAuth2SummitBadgeTypeApiTest — 11 tests.
OAuth2SummitBadgeViewTypeApiTest — 6 tests.
OAuth2SummitDocumentsApiControllerTest — 12 tests.
OAuth2SummitEmailEventFlowApiControllerTest — 4 tests.
OAuth2SummitEventsBulkActionsTest — 2 tests.
OAuth2SummitLocationsApiTest — 69 tests.

* chore(unit-tests): add missing endpoint coverage and fix skipped test

chore(ci): add OAuth2SummitTrackChairsRankingApiTest to GA pipeline

* chore(unit-tests): fix unit tests

*OAuth2RSVPSummitEventApiTest: rewrite to use InsertSummitTestData trait,
remove tests for undefined controller actions (addEventRSVP on
SummitMembersApiController), skip testDeleteEventRSVP due to
unimplemented SummitService::unRSVPEvent()
* OAuth2SpeakersAssistancesApiTest: rewrite to use InsertSummitTestData
 trait, use summit-bound speaker from presentations instead of
 self::$speaker which has no summit association, remove tests for
commented-out routes (sendAnnouncementEmail)
* OAuth2SponsoredProjectsApiTest: add InsertSummitTestData trait with
local assets disk config to avoid Swift/OpenStack dependency, replace
all hardcoded entity IDs with dynamically created test data, fix
addSupportingCompany to use POST (not PUT) with company from test data,
fix testUpdateSponsorshipType expected status (201 not 204)
* OAuth2SummitAccessLevelTypeTest: rewrite to use InsertSummitTestData
trait instead of hardcoded summit ID 27
* OAuth2SummitAdministratorPermissionGroupApiControllerTest: add missing
Mockery import, fix route param name (group_id not id) in
testGetByIdOK, add parent::tearDown() call

* chore(unit-tests): fix unit test

OAuth2SummitOrders, MediaUpload, Notifications, OrderExtraQuestion, PresentationAction
and PresentationActionType tests

chore(ci): add OAuth2SummitMediaFileTypeApiControllerTest, OAuth2SummitMediaUploadTypeApiControllerTest,
OAuth2SummitMetricsApiControllerTest, OAuth2SummitNotificationsApiControllerTest,
OAuth2SummitOrderExtraQuestionTypeApiTest, OAuth2SummitOrdersApiTest,
OAuth2SummitPresentationActionApiTest, OAuth2SummitPresentationActionTypeApiTest

* chore(unit-tests): fixes
chore(ci): add missing unit tests

Author: smarcet

.github/workflows/push.yml

@@ -51,6 +51,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             fail-fast: false
+            max-parallel: 8
             matrix:
                 suite:
                     - { name: "OAuth2SummitApiTest", filter: "--filter OAuth2SummitApiTest" }
@@ -69,6 +70,70 @@ jobs:
                     - { name: "AuditEventTypesTest", filter: "--filter AuditEventTypesTest" }
                     - { name: "GuzzleTracingTest", filter: "--filter GuzzleTracingTest" }
                     - { name: "Repositories", filter: "--filter tests/Repositories/" }
+                    - { name: "OAuth2AttendeesApiTest", filter: "--filter test/OAuth2AttendeesApiTest"}
+                    - { name: "OAuth2SummitSponsorApiTest", filter: "--filter test/OAuth2SummitSponsorApiTest"}
+                    - { name: "OAuth2BookableRoomAttributeTypesApiTest", filter: "--filter test/OAuth2BookableRoomAttributeTypesApiTest"}
+                    - { name: "OAuth2CompaniesApiTest", filter: "--filter test/OAuth2CompaniesApiTest"}
+                    - { name: "OAuth2ElectionsApiController", filter: "--filter test/OAuth2ElectionsApiController"}
+                    - { name: "OAuth2MembersApiTest", filter: "--filter test/OAuth2MembersApiTest"}
+                    - { name: "OAuth2GroupsApiTest", filter: "--filter test/OAuth2GroupsApiTest"}
+                    - { name: "OAuth2OAuth2SponsorshipTypeApiTest", filter: "--filter test/OAuth2OAuth2SponsorshipTypeApiTest"}
+                    - { name: "OAuth2OrganizationsApiTest", filter: "--filter test/OAuth2OrganizationsApiTest"}
+                    - { name: "OAuth2PresentationApiTest", filter: "--filter test/OAuth2PresentationApiTest"}
+                    - { name: "OAuth2PromoCodesApiTest", filter: "--filter test/OAuth2PromoCodesApiTest"}
+                    - { name: "OAuth2SummitPromoCodesApiTest", filter: "--filter test/OAuth2SummitPromoCodesApiTest"}
+                    - { name: "OAuth2SelectionPlansApiTest", filter: "--filter test/OAuth2SelectionPlansApiTest"}
+                    - { name: "OAuth2SummitSpeakersApiTest", filter: "--filter test/OAuth2SummitSpeakersApiTest" }
+                    - { name: "OAuth2SummitBadgesApiTest", filter: "--filter test/OAuth2SummitBadgesApiTest" }
+                    - { name: "OAuth2TracksApiTest", filter: "--filter test/OAuth2TracksApiTest" }
+                    - { name: "OAuth2TrackTagGroupsApiTest", filter: "--filter test/OAuth2TrackTagGroupsApiTest" }
+                    - { name: "OAuth2SummitTracksApiTest", filter: "--filter test/OAuth2SummitTracksApiTest" }
+                    - { name: "OAuth2TagsApiTest", filter: "--filter test/OAuth2TagsApiTest" }
+                    - { name: "OAuth2SummitSponsorshipApiControllerTest", filter: "--filter test/OAuth2SummitSponsorshipApiControllerTest" }
+                    - { name: "OAuth2SummitSponsorshipTypeApiControllerTest", filter: "--filter test/OAuth2SummitSponsorshipTypeApiControllerTest" }
+                    - { name: "OAuth2SummitSubmissionInvitationApiTest", filter: "--filter test/OAuth2SummitSubmissionInvitationApiTest" }
+                    - { name: "OAuth2SummitSubmittersApiTest", filter: "--filter test/OAuth2SummitSubmittersApiTest" }
+                    - { name: "OAuth2SummitTaxTypeApiTest", filter: "--filter test/OAuth2SummitTaxTypeApiTest" }
+                    - { name: "OAuth2SummitTicketTypesApiTest", filter: "--filter tests/OAuth2SummitTicketTypesApiTest" }
+                    - { name: "OAuth2SummitTicketsApiTest", filter: "--filter tests/OAuth2SummitTicketsApiTest" }
+                    - { name: "OAuth2SummitTrackChairsApiTest", filter: "--filter tests/OAuth2SummitTrackChairsApiTest" }
+                    - { name: "OAuth2SummitTrackChairsRankingApiTest", filter: "--filter tests/OAuth2SummitTrackChairsRankingApiTest" }
+                    - { name: "OAuth2TrackGroupsApiTest", filter: "--filter tests/OAuth2TrackGroupsApiTest" }
+                    - { name: "OAuth2TrackQuestionsTemplateTest", filter: "--filter tests/OAuth2TrackQuestionsTemplateTest" }
+                    - { name: "OAuth2SummitBadgeTypeApiTest", filter: "--filter tests/OAuth2SummitBadgeTypeApiTest" }
+                    - { name: "OAuth2SummitBadgeViewTypeApiTest", filter: "--filter tests/OAuth2SummitBadgeViewTypeApiTest" }
+                    - { name: "OAuth2SummitDocumentsApiControllerTest", filter: "--filter tests/OAuth2SummitDocumentsApiControllerTest" }
+                    - { name: "OAuth2SummitEmailEventFlowApiControllerTest", filter: "--filter tests/OAuth2SummitEmailEventFlowApiControllerTest" }
+                    - { name: "OAuth2SummitEventsBulkActionsTest", filter: "--filter tests/OAuth2SummitEventsBulkActionsTest" }
+                    - { name: "OAuth2SummitLocationsApiTest", filter: "--filter tests/OAuth2SummitLocationsApiTest" }
+                    - { name: "OAuth2RSVPSummitEventApiTest", filter: "--filter tests/OAuth2RSVPSummitEventApiTest" }
+                    - { name: "OAuth2SpeakerActiveInvolvementApiTest", filter: "--filter tests/OAuth2SpeakerActiveInvolvementApiTest" }
+                    - { name: "OAuth2SpeakerOrganizationalRoleApiTest", filter: "--filter tests/OAuth2SpeakerOrganizationalRoleApiTest" }
+                    - { name: "OAuth2SpeakersAssistancesApiTest", filter: "--filter tests/OAuth2SpeakersAssistancesApiTest" }
+                    - { name: "OAuth2SponsoredProjectsApiTest", filter: "--filter tests/OAuth2SponsoredProjectsApiTest" }
+                    - { name: "OAuth2SummitAccessLevelTypeTest", filter: "--filter tests/OAuth2SummitAccessLevelTypeTest" }
+                    - { name: "OAuth2SummitAdministratorPermissionGroupApiControllerTest", filter: "--filter tests/OAuth2SummitAdministratorPermissionGroupApiControllerTest" }
+                    - { name: "OAuth2SummitAttendeeBadgePrintApiControllerTest", filter: "--filter tests/OAuth2SummitAttendeeBadgePrintApiControllerTest" }
+                    - { name: "OAuth2SummitAttendeeNotesApiTest", filter: "--filter tests/OAuth2SummitAttendeeNotesApiTest" }
+                    - { name: "OAuth2SummitBadgeFeatureTypeApiTest", filter: "--filter tests/OAuth2SummitBadgeFeatureTypeApiTest" }
+                    - { name: "OAuth2SummitMediaFileTypeApiControllerTest", filter: "--filter tests/OAuth2SummitMediaFileTypeApiControllerTest" }
+                    - { name: "OAuth2SummitMediaUploadTypeApiControllerTest", filter: "--filter tests/OAuth2SummitMediaUploadTypeApiControllerTest" }
+                    - { name: "OAuth2SummitMetricsApiControllerTest", filter: "--filter tests/OAuth2SummitMetricsApiControllerTest" }
+                    - { name: "OAuth2SummitNotificationsApiControllerTest", filter: "--filter tests/OAuth2SummitNotificationsApiControllerTest" }
+                    - { name: "OAuth2SummitOrderExtraQuestionTypeApiTest", filter: "--filter tests/OAuth2SummitOrderExtraQuestionTypeApiTest" }
+                    - { name: "OAuth2SummitOrdersApiTest", filter: "--filter tests/OAuth2SummitOrdersApiTest" }
+                    - { name: "OAuth2SummitPresentationActionApiTest", filter: "--filter tests/OAuth2SummitPresentationActionApiTest" }
+                    - { name: "OAuth2SummitPresentationActionTypeApiTest", filter: "--filter tests/OAuth2SummitPresentationActionTypeApiTest" }
+                    - { name: "OAuth2SummitProposedScheduleApiTest", filter: "--filter tests/OAuth2SummitProposedScheduleApiTest" }
+                    - { name: "OAuth2SummitProposedScheduleAllowedLocationApiControllerTest", filter: "--filter tests/OAuth2SummitProposedScheduleAllowedLocationApiControllerTest" }
+                    - { name: "OAuth2SummitRefundPolicyTypeApiTest", filter: "--filter tests/OAuth2SummitRefundPolicyTypeApiTest" }
+                    - { name: "OAuth2SummitRegistrationCompaniesApiTest", filter: "--filter tests/OAuth2SummitRegistrationCompaniesApiTest" }
+                    - { name: "OAuth2SummitRegistrationInvitationApiControllerTest", filter: "--filter tests/OAuth2SummitRegistrationInvitationApiControllerTest" }
+                    - { name: "OAuth2SummitRSVPTemplateApiTest", filter: "--filter tests/OAuth2SummitRSVPTemplateApiTest" }
+                    - { name: "OAuth2SummitScheduleSettingsApiTest", filter: "--filter tests/OAuth2SummitScheduleSettingsApiTest" }
+                    - { name: "OAuth2SummitSelectedPresentationListApiTest", filter: "--filter tests/OAuth2SummitSelectedPresentationListApiTest" }
+                    - { name: "OAuth2SummitSelectionPlanExtraQuestionTypeApiTest", filter: "--filter tests/OAuth2SummitSelectionPlanExtraQuestionTypeApiTest" }
+                    - { name: "OAuth2SummitSelectionPlansApiTest", filter: "--filter tests/OAuth2SummitSelectionPlansApiTest" }
         env:
             OTEL_SERVICE_ENABLED: false
             APP_ENV: testing

app/Http/Controllers/Apis/Protected/Main/OAuth2ElectionsApiController.php

@@ -36,6 +36,8 @@ class OAuth2ElectionsApiController extends OAuth2ProtectedController
 
     use RequestProcessor;
 
+    use GetAndValidateJsonPayload;
+
     /**
      * @var IElectionService
      */

app/ModelSerializers/Summit/Registration/SummitRegistrationInvitationCSVSerializer.php

@@ -20,7 +20,6 @@ class SummitRegistrationInvitationCSVSerializer extends SilverStripeSerializer
 {
     protected static $array_mappings = [
         'MemberId' => 'member_id:json_int',
-        'OrderId' => 'order_id:json_int',
         'SummitId' => 'summit_id:json_int',
         'FirstName' => 'first_name:json_string',
         'LastName' => 'last_name:json_string',
@@ -66,4 +65,4 @@ public function serialize($expand = null, array $fields = [], array $relations =
 
         return $values;
     }
-}
+}

app/Models/Foundation/Summit/Registration/Attendees/SummitAttendee.php

@@ -440,7 +440,7 @@ public function getRsvpByEvent($event_id)
      * @param int $ticket_id
      * @return SummitAttendeeTicket
      */
-    public function getTicketById($ticket_id)
+    public function getTicketById(int $ticket_id)
     {
         $ticket = $this->tickets->matching(
             $criteria = Criteria::create()
@@ -1223,8 +1223,8 @@ public function getBoughtTicketTypes(): array
     {
         try {
             $sql = <<<SQL
-SELECT TicketTypeID AS type_id, COUNT(SummitTicketType.ID) AS qty, SummitTicketType.Name AS type_name FROM `SummitAttendeeTicket` 
-INNER JOIN SummitTicketType ON SummitTicketType.ID = SummitAttendeeTicket.TicketTypeID                                                  
+SELECT TicketTypeID AS type_id, COUNT(SummitTicketType.ID) AS qty, SummitTicketType.Name AS type_name FROM `SummitAttendeeTicket`
+INNER JOIN SummitTicketType ON SummitTicketType.ID = SummitAttendeeTicket.TicketTypeID
 WHERE OwnerID = :owner_id AND
 SummitAttendeeTicket.IsActive = 1 AND
 SummitAttendeeTicket.Status = 'Paid'
@@ -1311,12 +1311,12 @@ public function getAllowedBadgeFeatures(bool $exclude_deactivated_tickets = true
         }
 
         $query = <<<SQL
-SELECT DISTINCT E.* 
+SELECT DISTINCT E.*
 FROM SummitBadgeFeatureType E
 INNER JOIN SummitAttendeeBadge_Features ON SummitAttendeeBadge_Features.SummitBadgeFeatureTypeID = E.ID
 INNER JOIN SummitAttendeeBadge ON SummitAttendeeBadge.ID = SummitAttendeeBadge_Features.SummitAttendeeBadgeID
 INNER JOIN SummitAttendeeTicket ON SummitAttendeeTicket.ID = SummitAttendeeBadge.TicketID
-WHERE SummitAttendeeTicket.OwnerID = :owner_id 
+WHERE SummitAttendeeTicket.OwnerID = :owner_id
   AND SummitAttendeeTicket.Status = 'Paid'
   {$extra_where}
 UNION
@@ -1615,4 +1615,4 @@ public function isTicketActive(string $ticket_number): bool
     public function setLastReminderEmailSentDate(?\DateTime $last_reminder_email_sent_date): void{
         $this->last_reminder_email_sent_date = $last_reminder_email_sent_date;
     }
-}
+}

app/Services/Model/Imp/SummitTicketTypeService.php

@@ -319,17 +319,6 @@ public function seedSummitTicketTypesFromEventBrite(Summit $summit)
                     $res[] = $new_ticket_type;
                 }
 
-                foreach ($res as $ticket_type) {
-                    Event::dispatch
-                    (
-                        new SummitTicketTypeInserted
-                        (
-                            $ticket_type->getId(),
-                            $ticket_type->getSummitId()
-                        )
-                    );
-                }
-
                 ++$page;
             } while ($has_more_items);
 
@@ -410,4 +399,4 @@ public function updateCurrencySymbol(Summit $summit, string $currency_symbol): v
             }
         });
     }
-}
+}

database/seeders/ApiEndpointsSeeder.php

@@ -6508,7 +6508,7 @@ private function seedSummitEndpoints()
             ],
             [
                 'name' => 'get-attendees-votes',
-                'route' => '/api/v1/summits/{id}/presentations/{id}/attendee-votes',
+                'route' => '/api/v1/summits/{id}/presentations/{presentation_id}/attendee-votes',
                 'http_method' => 'GET',
                 'scopes' => [
                     sprintf(SummitScopes::ReadSummitData, $current_realm),
@@ -6725,7 +6725,7 @@ private function seedSummitEndpoints()
             ],
             [
                 'name' => 'get-presentation-video',
-                'route' => '/api/v1/summits/{id}/presentations/{presentation_id}/video/{video_id}',
+                'route' => '/api/v1/summits/{id}/presentations/{presentation_id}/videos/{video_id}',
                 'http_method' => 'GET',
                 'scopes' => [
                     sprintf(SummitScopes::ReadSummitData, $current_realm),

database/seeders/ConfigSeeder.php

@@ -30,6 +30,7 @@ public function run()
         try {
             // clear all
             $em = Registry::getManager(ResourceServerEntity::EntityManager);
+            $em->clear();
             $connection = $em->getConnection();
             $connection->beginTransaction();
             $statements = [
@@ -53,4 +54,4 @@ public function run()
             Log::error($ex);
         }
     }
-}
+}

routes/api_v1.php

@@ -1346,7 +1346,7 @@
 
                 // sponsor services statistics
                 Route::group(['prefix' => 'sponsorservices-statistics'], function(){
-                    Route::put('', ['uses' => 'OAuth2SummitSponsorApiController@updateSponsorServicesStatistics']);
+                    Route::put('', ['middleware' => 'auth.user', 'uses' => 'OAuth2SummitSponsorApiController@updateSponsorServicesStatistics']);
                 });
             });
         });

tests/BrowserKitTestCase.php

@@ -37,6 +37,8 @@ abstract class BrowserKitTestCase extends BaseTestCase {
      */
     protected $baseUrl = "http://localhost";
 
+    private static $seeding_done = false;
+
     protected function setUp(): void {
         parent::setUp(); // Don't forget this!
         $this->redis = Redis::connection();
@@ -53,21 +55,26 @@ protected function prepareForTests(): void {
         // see https://laravel.com/docs/9.x/mocking#mail-fake
         Mail::fake();
         Model::unguard();
-        // clean up
-        DB::setDefaultConnection("model");
-        Artisan::call("doctrine:migrations:migrate", ["--em" => "config", "--no-interaction" => true]);
-        Artisan::call("doctrine:migrations:migrate", ["--em" => "model", "--no-interaction" => true]);
+        if(!self::$seeding_done) {
+            // clean up
+            DB::setDefaultConnection("model");
+            Artisan::call("doctrine:migrations:migrate", ["--em" => "config", "--no-interaction" => true]);
+            Artisan::call("doctrine:migrations:migrate", ["--em" => "model", "--no-interaction" => true]);
+
+            DB::setDefaultConnection("config");
+
+            DB::delete("DELETE FROM endpoint_api_scopes");
+            DB::delete("DELETE FROM endpoint_api_authz_groups");
+            DB::delete("DELETE FROM api_scopes");
+            DB::delete("DELETE FROM api_endpoints");
+            DB::delete("DELETE FROM apis");
 
-        DB::setDefaultConnection("config");
 
-        DB::delete("DELETE FROM endpoint_api_scopes");
-        DB::delete("DELETE FROM endpoint_api_authz_groups");
-        DB::delete("DELETE FROM api_scopes");
-        DB::delete("DELETE FROM api_endpoints");
-        DB::delete("DELETE FROM apis");
+            $this->seed(ConfigSeeder::class);
 
-        $this->seed(ConfigSeeder::class);
-        $this->seed(MainDataSeeder::class);
-        $this->seed(SummitEmailFlowTypeSeeder::class);
+            $this->seed(MainDataSeeder::class);
+            $this->seed(SummitEmailFlowTypeSeeder::class);
+            self::$seeding_done = true;
+        }
     }
-}
+}

tests/InsertSummitTestData.php

@@ -1008,7 +1008,9 @@ protected static function clearSummitTestData(){
         self::$em->remove(self::$summit);
         self::$em->remove(self::$summit2);
         self::$em->remove(self::$summit_permission_group);
-        self::$em->remove(self::$default_media_file_type);
+        if (!is_null(self::$default_media_file_type)) {
+            self::$em->remove(self::$default_media_file_type);
+        }
         self::$em->flush();
 
         // reset static vars