feat: remove x-prefix from xFullText and xOngoing event search params

nikomakela · nikomakela · commit 7cedb28706eb · 2025-08-28T09:27:02.000+03:00
TH-1428.

The filter `xFullText` is renamed to `fullText` and `xOngoing` to
`ongoing` during the final phase of experiment stage in LinkedEvents
API. The x-prefix is removed, since the x is for experimental features.
diff --git a/apps/sports-helsinki/src/domain/event/__tests__/EventPageContainer.test.tsx b/apps/sports-helsinki/src/domain/event/__tests__/EventPageContainer.test.tsx
@@ -117,8 +117,8 @@ const mocks = [
   }),
   createEventListRequestAndResultMocks({
     variables: {
-      xFullText: '',
-      xOngoing: true,
+      fullText: '',
+      ongoing: true,
       keywordOrSet2: eventKeywordIds,
       eventType: [EventTypeId.Course],
       superEvent: 'none',
@@ -233,8 +233,8 @@ it('shows similar events when SIMILAR_EVENTS flag is on', async () => {
       ...mocks,
       createEventListRequestAndResultMocks({
         variables: {
-          xFullText: '',
-          xOngoing: true,
+          fullText: '',
+          ongoing: true,
           keywordOrSet2: ['yso:p916', 'yso:p9824', 'yso:p6409'],
           eventType: [EventTypeId.Course],
           superEvent: 'none',
@@ -277,8 +277,8 @@ it('doesnt show similar events when keywords are not mapped', async () => {
     ...mocks,
     createEventListRequestAndResultMocks({
       variables: {
-        xFullText: '',
-        xOngoing: true,
+        fullText: '',
+        ongoing: true,
         internetBased: undefined,
         keywordOrSet2: [''],
         language: undefined,
diff --git a/apps/sports-helsinki/src/domain/search/combinedSearch/__tests__/SearchUtilities.test.tsx b/apps/sports-helsinki/src/domain/search/combinedSearch/__tests__/SearchUtilities.test.tsx
@@ -55,17 +55,17 @@ const mocks = [
   }),
   createEventListRequestAndResultMocks({
     variables: {
-      xFullText: '',
-      xOngoing: true,
+      fullText: '',
+      ongoing: true,
       keywordOrSet1: SPORT_COURSES_KEYWORDS,
       language: undefined,
     },
     response: fakeEvents(5),
   }),
   createEventListRequestAndResultMocks({
     variables: {
-      xFullText: '',
-      xOngoing: true,
+      fullText: '',
+      ongoing: true,
       keywordOrSet1: SPORT_COURSES_KEYWORDS,
       language: undefined,
       eventType: EventTypeId.Course,
@@ -74,8 +74,8 @@ const mocks = [
   }),
   createEventListRequestAndResultMocks({
     variables: {
-      xFullText: '',
-      xOngoing: true,
+      fullText: '',
+      ongoing: true,
       keywordOrSet1: SPORT_COURSES_KEYWORDS,
       language: undefined,
       eventType: EventTypeId.General,
diff --git a/apps/sports-helsinki/src/domain/search/combinedSearch/adapters/EventSearchAdapter.ts b/apps/sports-helsinki/src/domain/search/combinedSearch/adapters/EventSearchAdapter.ts
@@ -17,8 +17,8 @@ class EventSearchAdapter implements CombinedSearchAdapter<EventSearchParams> {
    * List here all the event and course search parameters
    * that are wanted to be mapped with the combined search.
    */
-  xFullText?: EventSearchParams['xFullText'];
-  xOngoing: EventSearchParams['xOngoing'];
+  fullText?: EventSearchParams['fullText'];
+  ongoing: EventSearchParams['ongoing'];
   start: EventSearchParams['start'];
   end: EventSearchParams['end'];
   include: EventSearchParams['include'];
@@ -50,7 +50,7 @@ class EventSearchAdapter implements CombinedSearchAdapter<EventSearchParams> {
     // Initialize the object with default values
     Object.assign(this, initialEventSearchAdapterValues, { eventType });
 
-    this.xFullText = input.text || initialEventSearchAdapterValues.xFullText;
+    this.fullText = input.text || initialEventSearchAdapterValues.fullText;
     this.keywordAnd = [];
     this.keywordOrSet1 = SPORT_COURSES_KEYWORDS;
     this.keywordOrSet2 = this.getSportsKeywords(input);
diff --git a/apps/sports-helsinki/src/domain/search/combinedSearch/adapters/__tests__/CombinedSearchFormAdapter.test.ts b/apps/sports-helsinki/src/domain/search/combinedSearch/adapters/__tests__/CombinedSearchFormAdapter.test.ts
@@ -136,8 +136,8 @@ describe('CombinedSearchFormAdapter', () => {
           keywordAnd: outputQuery.keywords,
           sort: outputQuery.eventOrderBy ?? null,
           eventType: EventTypeId.General,
-          xFullText: outputQuery.text,
-          xOngoing: true,
+          fullText: outputQuery.text,
+          ongoing: true,
           start: 'now',
           end: '',
           keywordNot: [],
diff --git a/apps/sports-helsinki/src/domain/search/combinedSearch/adapters/__tests__/EventSearchAdapter.test.ts b/apps/sports-helsinki/src/domain/search/combinedSearch/adapters/__tests__/EventSearchAdapter.test.ts
@@ -21,8 +21,8 @@ describe('EventSearchAdapter', () => {
         const adapter = new EventSearchAdapter(input, eventType);
         const result = {
           eventType,
-          xFullText: input.text,
-          xOngoing: true,
+          fullText: input.text,
+          ongoing: true,
           start: 'now',
           end: '',
           keywordAnd: input.keywords,
diff --git a/apps/sports-helsinki/src/domain/search/combinedSearch/adapters/__tests__/__snapshots__/CombinedSearchProvider.test.tsx.snap b/apps/sports-helsinki/src/domain/search/combinedSearch/adapters/__tests__/__snapshots__/CombinedSearchProvider.test.tsx.snap
diff --git a/apps/sports-helsinki/src/domain/search/combinedSearch/constants.ts b/apps/sports-helsinki/src/domain/search/combinedSearch/constants.ts
@@ -46,8 +46,8 @@ export const initialVenueSearchAdapterValues = {
 } as const satisfies VenueSearchParams;
 
 export const initialEventSearchAdapterValues = {
-  xFullText: '',
-  xOngoing: true,
+  fullText: '',
+  ongoing: true,
   start: 'now',
   end: '',
   include: ['keywords', 'location'] as string[],
diff --git a/apps/sports-helsinki/src/domain/search/combinedSearch/types.ts b/apps/sports-helsinki/src/domain/search/combinedSearch/types.ts
@@ -94,8 +94,8 @@ export type CombinedSearchAdapterInputFallback =
 /** The fields that are used by the Event and Course search. */
 export type EventSearchParams = Pick<
   EventListQueryVariables,
-  | 'xFullText'
-  | 'xOngoing'
+  | 'fullText'
+  | 'ongoing'
   | 'start'
   | 'end'
   | 'include'
diff --git a/apps/sports-helsinki/src/domain/search/eventSearch/utils.tsx b/apps/sports-helsinki/src/domain/search/eventSearch/utils.tsx
@@ -227,8 +227,8 @@ export const getEventSearchVariables = ({
   ];
 
   return {
-    xFullText: text?.join(', '),
-    xOngoing: true,
+    fullText: text?.join(', '),
+    ongoing: true,
     isFree: isFree || undefined,
     end,
     include,
diff --git a/packages/components/src/components/domain/eventSearch/query.ts b/packages/components/src/components/domain/eventSearch/query.ts
@@ -38,8 +38,8 @@ export const QUERY_EVENT_LIST = gql`
     $text: String
     $translation: String
     # Experimental fields...
-    $xFullText: String
-    $xOngoing: Boolean
+    $fullText: String
+    $ongoing: Boolean
   ) {
     eventList(
       audienceMaxAgeGt: $audienceMaxAgeGt
@@ -78,8 +78,8 @@ export const QUERY_EVENT_LIST = gql`
       text: $text
       translation: $translation
       # Experimental fields...
-      xFullText: $xFullText
-      xOngoing: $xOngoing
+      fullText: $fullText
+      ongoing: $ongoing
     ) {
       meta {
         count
diff --git a/packages/components/src/components/filterButton/types.ts b/packages/components/src/components/filterButton/types.ts
@@ -1,6 +1,6 @@
 export type AgeFilterType = 'maxAge' | 'minAge';
 export type DateFilterType = 'date' | 'dateType';
-export type TextFilterType = 'text' | 'xFullText';
+export type TextFilterType = 'text' | 'fullText';
 
 /**
  * @deprecated since the CombinedSearch refactoring its new types and adapters should
diff --git a/packages/components/src/constants/event-constants.ts b/packages/components/src/constants/event-constants.ts
@@ -62,8 +62,8 @@ export enum EVENT_SEARCH_FILTERS {
   PLACES = 'places',
   PUBLISHER = 'publisher',
   START = 'start',
-  TEXT = 'xFullText',
-  ONGOING = 'xOngoing',
+  TEXT = 'fullText',
+  ONGOING = 'ongoing',
   MIN_AGE = 'audienceMinAgeLt',
   MAX_AGE = 'audienceMaxAgeGt',
   SUITABLE = 'suitableFor',
diff --git a/packages/components/src/types/generated/graphql.tsx b/packages/components/src/types/generated/graphql.tsx
@@ -8685,8 +8685,8 @@ export type QueryEventListArgs = {
   superEventType?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
   text?: InputMaybe<Scalars['String']['input']>;
   translation?: InputMaybe<Scalars['String']['input']>;
-  xFullText?: InputMaybe<Scalars['String']['input']>;
-  xOngoing?: InputMaybe<Scalars['Boolean']['input']>;
+  fullText?: InputMaybe<Scalars['String']['input']>;
+  ongoing?: InputMaybe<Scalars['Boolean']['input']>;
 };
 
 /** The root entry point into the Graph */
@@ -14702,8 +14702,8 @@ export type EventListQueryVariables = Exact<{
   >;
   text?: InputMaybe<Scalars['String']['input']>;
   translation?: InputMaybe<Scalars['String']['input']>;
-  xFullText?: InputMaybe<Scalars['String']['input']>;
-  xOngoing?: InputMaybe<Scalars['Boolean']['input']>;
+  fullText?: InputMaybe<Scalars['String']['input']>;
+  ongoing?: InputMaybe<Scalars['Boolean']['input']>;
 }>;
 
 export type EventListQuery = {
@@ -16359,8 +16359,8 @@ export const EventListDocument = gql`
     $superEventType: [String]
     $text: String
     $translation: String
-    $xFullText: String
-    $xOngoing: Boolean
+    $fullText: String
+    $ongoing: Boolean
   ) {
     eventList(
       audienceMaxAgeGt: $audienceMaxAgeGt
@@ -16398,8 +16398,8 @@ export const EventListDocument = gql`
       superEventType: $superEventType
       text: $text
       translation: $translation
-      xFullText: $xFullText
-      xOngoing: $xOngoing
+      fullText: $fullText
+      ongoing: $ongoing
     ) {
       meta {
         count
@@ -16461,8 +16461,8 @@ export const EventListDocument = gql`
  *      superEventType: // value for 'superEventType'
  *      text: // value for 'text'
  *      translation: // value for 'translation'
- *      xFullText: // value for 'xFullText'
- *      xOngoing: // value for 'xOngoing'
+ *      fullText: // value for 'fullText'
+ *      ongoing: // value for 'ongoing'
  *   },
  * });
  */
diff --git a/proxies/events-graphql-federation/subgraphs/events/events.graphql b/proxies/events-graphql-federation/subgraphs/events/events.graphql
diff --git a/proxies/events-graphql-federation/supergraph.graphql b/proxies/events-graphql-federation/supergraph.graphql
diff --git a/proxies/events-graphql-proxy/src/schema/event/typeDefs.ts b/proxies/events-graphql-proxy/src/schema/event/typeDefs.ts
diff --git a/proxies/events-graphql-proxy/src/schema/event/utils.ts b/proxies/events-graphql-proxy/src/schema/event/utils.ts
diff --git a/proxies/events-graphql-proxy/src/types/types.ts b/proxies/events-graphql-proxy/src/types/types.ts
