TW-1364 Remove migrations

madfish-solutions · Apr 11, 2024 · 7e0139b · 7e0139b
1 parent 16c25e3
commit 7e0139b
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 67 deletions.
diff --git a/src/advertising/external-ads.ts b/src/advertising/external-ads.ts
@@ -1,7 +1,6 @@
 import { satisfies as versionSatisfiesRange } from 'semver';
 
 import { objectStorageMethodsFactory, redisClient } from '../redis';
-import { isDefined } from '../utils/helpers';
 
 /** Style properties names that are likely to be unnecessary for banners are skipped */
 export const stylePropsNames = [
@@ -86,7 +85,7 @@ interface AdStylesOverrides {
 }
 
 interface ExtVersionConstraints {
-  extVersion?: string;
+  extVersion: string;
 }
 
 export interface AdPlacesRule extends ExtVersionConstraints {
@@ -139,12 +138,11 @@ export interface AdProviderForAllSitesRule extends ExtVersionConstraints {
   providers: string[];
 }
 
-const AD_PLACES_RULES_KEY = 'slise_ad_places_rules';
-const AD_PROVIDERS_BY_SITES_KEY = 'slise_ad_providers_by_sites';
-const AD_PROVIDERS_ALL_SITES_KEY = 'slise_ad_providers_all_sites';
-const SLISE_AD_PROVIDERS_LIST_KEY = 'slise_ad_providers_list';
+const AD_PLACES_RULES_KEY = 'ad_places_rules';
+const AD_PROVIDERS_BY_SITES_KEY = 'ad_providers_by_sites';
+const AD_PROVIDERS_ALL_SITES_KEY = 'ad_providers_all_sites';
 const AD_PROVIDERS_LIST_KEY = 'ad_providers_list';
-const PERMANENT_AD_PLACES_RULES_KEY = 'permanent_slise_ad_places_rules';
+const PERMANENT_AD_PLACES_RULES_KEY = 'permanent_ad_places_rules';
 const PERMANENT_NATIVE_AD_PLACES_RULES_KEY = 'permanent_native_ad_places_rules';
 
 export const adPlacesRulesMethods = objectStorageMethodsFactory<AdPlacesRule[]>(AD_PLACES_RULES_KEY, []);
@@ -154,9 +152,6 @@ export const adProvidersByDomainRulesMethods = objectStorageMethodsFactory<AdPro
   []
 );
 
-/** @deprecated */
-export const adProvidersMethodsLegacy = objectStorageMethodsFactory<string[]>(SLISE_AD_PROVIDERS_LIST_KEY, []);
-
 export const adProvidersMethods = objectStorageMethodsFactory<AdProviderSelectorsRule[]>(AD_PROVIDERS_LIST_KEY, []);
 
 export const permanentAdPlacesMethods = objectStorageMethodsFactory<PermanentAdPlacesRule[]>(
@@ -177,5 +172,7 @@ export const addAdProvidersForAllSites = async (providers: string[]) =>
 export const removeAdProvidersForAllSites = async (providers: string[]) =>
   redisClient.srem(AD_PROVIDERS_ALL_SITES_KEY, ...providers);
 
-export const filterByVersion = <T extends ExtVersionConstraints>(rules: T[], version = '1.20.1') =>
-  rules.filter(({ extVersion }) => !isDefined(extVersion) || versionSatisfiesRange(version, extVersion));
+const FALLBACK_VERSION = '0.0.0';
+
+export const filterByVersion = <T extends ExtVersionConstraints>(rules: T[], version?: string) =>
+  rules.filter(({ extVersion }) => versionSatisfiesRange(version ?? FALLBACK_VERSION, extVersion));
diff --git a/src/index.ts b/src/index.ts
@@ -33,7 +33,6 @@ import { CodedError } from './utils/errors';
 import { coinGeckoTokens } from './utils/gecko-tokens';
 import { getExternalApiErrorPayload, isDefined, isNonEmptyString } from './utils/helpers';
 import logger from './utils/logger';
-import { doMigrations } from './utils/migrations';
 import { getSignedMoonPayUrl } from './utils/moonpay/get-signed-moonpay-url';
 import { getSigningNonce } from './utils/signing-nonce';
 import SingleQueryDataProvider from './utils/SingleQueryDataProvider';
@@ -103,11 +102,6 @@ const makeProviderDataRequestHandler = <T, U>(provider: SingleQueryDataProvider<
   };
 };
 
-doMigrations().catch(error => {
-  console.error(error);
-  process.exit(1);
-});
-
 app.get('/api/top-coins', (_req, res) => {
   res.status(200).send(coinGeckoTokens);
 });

diff --git a/src/routers/slise-ad-rules/ad-places.ts b/src/routers/slise-ad-rules/ad-places.ts
@@ -74,6 +74,7 @@ import {
  *           description: >
  *             A range of versions where the rule is applicable. If not specified, the rule is applicable
  *             for all versions. See the [ranges format](https://www.npmjs.com/package/semver#ranges)
+ *           default: '*'
  *     AdPlacesRule:
  *       allOf:
  *         - $ref: '#/components/schemas/ExtVersionConstraints'
@@ -337,7 +338,7 @@ export const adPlacesRulesRouter = Router();
  *         name: extVersion
  *         schema:
  *           type: string
- *           default: '1.20.1'
+ *           default: '0.0.0'
  *         description: The extension version for which the rules should be returned
  *     responses:
  *       '200':
@@ -360,7 +361,7 @@ export const adPlacesRulesRouter = Router();
  *         name: extVersion
  *         schema:
  *           type: string
- *           default: '1.20.1'
+ *           default: '0.0.0'
  *         description: The extension version for which the rules should be returned
  *     responses:
  *       '200':
@@ -486,7 +487,7 @@ addObjectStorageMethodsToRouter(adPlacesRulesRouter, {
  *         name: extVersion
  *         schema:
  *           type: string
- *           default: '1.20.1'
+ *           default: '0.0.0'
  *         description: The extension version for which the rules should be returned
  *     responses:
  *       '200':
@@ -509,7 +510,7 @@ addObjectStorageMethodsToRouter(adPlacesRulesRouter, {
  *         name: extVersion
  *         schema:
  *           type: string
- *           default: '1.20.1'
+ *           default: '0.0.0'
  *         description: The extension version for which the rules should be returned
  *     responses:
  *       '200':
@@ -635,7 +636,7 @@ addObjectStorageMethodsToRouter(adPlacesRulesRouter, {
  *         name: extVersion
  *         schema:
  *           type: string
- *           default: '1.20.1'
+ *           default: '0.0.0'
  *         description: The extension version for which the rules should be returned
  *     responses:
  *       '200':
@@ -658,7 +659,7 @@ addObjectStorageMethodsToRouter(adPlacesRulesRouter, {
  *         name: extVersion
  *         schema:
  *           type: string
- *           default: '1.20.1'
+ *           default: '0.0.0'
  *         description: The extension version for which the rules should be returned
  *     responses:
  *       '200':

diff --git a/src/routers/slise-ad-rules/providers.ts b/src/routers/slise-ad-rules/providers.ts
@@ -351,7 +351,7 @@ addObjectStorageMethodsToRouter(adProvidersRouter, {
  *         name: extVersion
  *         schema:
  *           type: string
- *           default: '1.20.1'
+ *           default: '0.0.0'
  *         description: The extension version for which the rules should be returned
  *     responses:
  *       '200':
@@ -378,7 +378,7 @@ addObjectStorageMethodsToRouter(adProvidersRouter, {
  *         name: extVersion
  *         schema:
  *           type: string
- *           default: '1.20.1'
+ *           default: '0.0.0'
  *         description: The extension version for which the rules should be returned
  *     responses:
  *       '200':

diff --git a/src/utils/express-helpers.ts b/src/utils/express-helpers.ts
@@ -21,6 +21,7 @@ export const withBodyValidation =
   <T>(schema: Schema<T>, handler: TypedBodyRequestHandler<T>): RequestHandler =>
   async (req, res, next) => {
     try {
+      console.log('oy vey 1', JSON.stringify(req.body), JSON.stringify(await schema.validate(req.body)));
       req.body = await schema.validate(req.body);
     } catch (error) {
       if (error instanceof ValidationError) {

diff --git a/src/utils/migrations.ts b/src/utils/migrations.ts
diff --git a/src/utils/schemas.ts b/src/utils/schemas.ts
@@ -122,8 +122,8 @@ const adPlacesRulesSchema = arraySchema()
           })
           .required(),
         stylesOverrides: arraySchema().of(adStylesOverridesSchema.clone().required()),
-        shouldHideOriginal: booleanSchema().default(false),
-        extVersion: versionRangeSchema
+        shouldHideOriginal: booleanSchema(),
+        extVersion: versionRangeSchema.clone().required()
       })
       .required()
   )
@@ -156,14 +156,14 @@ const permanentAdPlacesRulesSchema = arraySchema()
         insertionIndex: numberSchema().integer(),
         insertBeforeSelector: cssSelectorSchema,
         insertAfterSelector: cssSelectorSchema,
-        insertionsCount: numberSchema().integer().min(1).default(1),
+        insertionsCount: numberSchema().integer().min(1),
         shouldUseDivWrapper: booleanSchema().required(),
         elementStyle: styleSchema,
         divWrapperStyle: styleSchema,
         elementToMeasureSelector: cssSelectorSchema,
         stylesOverrides: arraySchema().of(adStylesOverridesSchema.clone().required()),
-        shouldHideOriginal: booleanSchema().default(false),
-        extVersion: versionRangeSchema
+        shouldHideOriginal: booleanSchema(),
+        extVersion: versionRangeSchema.clone().required()
       })
       .test('insertion-place-specified', (value: PermanentAdPlacesRule | undefined) => {
         if (!value) {
@@ -194,7 +194,7 @@ const adProvidersByDomainRulesSchema = arraySchema()
       .shape({
         urlRegexes: arraySchema().of(regexStringSchema.clone().required()).required(),
         providers: arraySchema().of(stringSchema().required()).required(),
-        extVersion: versionRangeSchema
+        extVersion: versionRangeSchema.clone().required()
       })
       .required()
   )
@@ -205,7 +205,7 @@ export const adProvidersByDomainsRulesDictionarySchema: IObjectSchema<Record<str
 
 const adProvidersSelectorsRuleSchema = objectSchema().shape({
   selectors: cssSelectorsListSchema.clone().required(),
-  extVersion: versionRangeSchema
+  extVersion: versionRangeSchema.clone().required()
 });
 
 export const adProvidersDictionarySchema: IObjectSchema<Record<string, AdProviderSelectorsRule[]>> =