Move refresh of EstablishmentLastActivityView into shared util

NMDSdevopsServiceAdm · Sep 19, 2024 · 67a4a9b · 67a4a9b
1 parent 1850eb7
commit 67a4a9b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 17 deletions.
diff --git a/backend/server/models/email-campaigns/inactive-workplaces/getInactiveWorkplaces.js b/backend/server/models/email-campaigns/inactive-workplaces/getInactiveWorkplaces.js
@@ -2,10 +2,6 @@ const moment = require('moment');
 
 const models = require('../../index');
 
-const refreshInactiveWorkplaces = async () => {
-  return models.sequelize.query('REFRESH MATERIALIZED VIEW cqc."EstablishmentLastActivity"');
-};
-
 const getInactiveWorkplaces = async () => {
   const lastMonth = moment().subtract(1, 'months');
 
@@ -66,5 +62,4 @@ const getInactiveWorkplaces = async () => {
 
 module.exports = {
   getInactiveWorkplaces,
-  refreshInactiveWorkplaces,
 };
diff --git a/...end/server/models/email-campaigns/inactive-workplaces/getInactiveWorkplacesForDeletion.js b/...end/server/models/email-campaigns/inactive-workplaces/getInactiveWorkplacesForDeletion.js
@@ -2,10 +2,6 @@ const moment = require('moment');
 
 const models = require('../../index');
 
-const refreshInactiveWorkplacesForDeletion = async () => {
-  return models.sequelize.query('REFRESH MATERIALIZED VIEW cqc."EstablishmentLastActivity"');
-};
-
 const getInactiveWorkplacesForDeletion = async () => {
   const lastMonth = moment().subtract(1, 'months').endOf('month');
   const twentyFourLastMonths = lastMonth.clone().subtract(24, 'months').format('YYYY-MM-DD');
@@ -59,5 +55,4 @@ const getInactiveWorkplacesForDeletion = async () => {
 
 module.exports = {
   getInactiveWorkplacesForDeletion,
-  refreshInactiveWorkplacesForDeletion,
 };
diff --git a/backend/server/services/email-campaigns/inactive-workplaces/setInactiveWorkplaces.js b/backend/server/services/email-campaigns/inactive-workplaces/setInactiveWorkplaces.js
@@ -1,8 +1,6 @@
 const nextEmail = require('./nextEmail');
-const {
-  getInactiveWorkplaces,
-  refreshInactiveWorkplaces,
-} = require('../../../models/email-campaigns/inactive-workplaces/getInactiveWorkplaces');
+const { getInactiveWorkplaces } = require('../../../models/email-campaigns/inactive-workplaces/getInactiveWorkplaces');
+const { refreshEstablishmentLastActivityView } = require('../../../utils/db/inactiveWorkplacesUtils');
 
 const transformInactiveWorkplaces = (inactiveWorkplace) => {
   const id = inactiveWorkplace.EstablishmentID;
@@ -30,7 +28,7 @@ const transformInactiveWorkplaces = (inactiveWorkplace) => {
 };
 
 const findInactiveWorkplaces = async () => {
-  await refreshInactiveWorkplaces();
+  await refreshEstablishmentLastActivityView();
 
   return (await getInactiveWorkplaces()).filter(nextEmail.shouldReceive).map(transformInactiveWorkplaces);
 };

diff --git a/...d/server/services/email-campaigns/inactive-workplaces/setInactiveWorkplacesForDeletion.js b/...d/server/services/email-campaigns/inactive-workplaces/setInactiveWorkplacesForDeletion.js
@@ -1,7 +1,7 @@
 const {
   getInactiveWorkplacesForDeletion,
-  refreshInactiveWorkplacesForDeletion,
 } = require('../../../models/email-campaigns/inactive-workplaces/getInactiveWorkplacesForDeletion');
+const { refreshEstablishmentLastActivityView } = require('../../../utils/db/inactiveWorkplacesUtils');
 
 const transformInactiveWorkplacesForDeletion = (inactiveWorkplace) => {
   const name = inactiveWorkplace.NameValue;
@@ -34,7 +34,7 @@ const formattedAddress = (inactiveWorkplace) => {
 };
 
 const findInactiveWorkplacesForDeletion = async () => {
-  await refreshInactiveWorkplacesForDeletion();
+  await refreshEstablishmentLastActivityView();
   return (await getInactiveWorkplacesForDeletion()).map(transformInactiveWorkplacesForDeletion);
 };
 

diff --git a/backend/server/utils/db/inactiveWorkplacesUtils.js b/backend/server/utils/db/inactiveWorkplacesUtils.js
@@ -0,0 +1,5 @@
+const models = require('../../models');
+
+module.exports.refreshEstablishmentLastActivityView = async () => {
+  return models.sequelize.query('REFRESH MATERIALIZED VIEW cqc."EstablishmentLastActivity"');
+};