Resolve merge conflicts with master

Author: keshan3262

src/routers/slise-ad-rules/providers.ts

@@ -172,7 +172,7 @@ adProvidersRouter
     withExceptionHandler(async (_req, res) => {
       const providers = await getAdProvidersForAllSites();
 
-      res.status(200).send(providers);
+      res.status(200).header('Cache-Control', 'public, max-age=300').send(providers);
     })
   )
   .post(

src/utils/express-helpers.ts

@@ -21,7 +21,6 @@ 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) {
@@ -85,7 +84,7 @@ export const addObjectStorageMethodsToRouter = <U, V = U>(
 
       const value = await methods.getByKey(key);
 
-      res.status(200).send(value);
+      res.status(200).header('Cache-Control', 'public, max-age=300').send(value);
     })
   );
 
@@ -108,6 +107,7 @@ export const addObjectStorageMethodsToRouter = <U, V = U>(
 
         res
           .status(200)
+          .header('Cache-Control', 'public, max-age=300')
           .send(
             Object.fromEntries(Object.entries(values).map(([key, value]) => [key, transformGotValueFn(value, req)]))
           );