hot fixies and query url changed (#74)

bcgov · Sep 6, 2023 · e57f624 · e57f624
1 parent 7c34f62
commit e57f624
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 45 deletions.
diff --git a/src/ches/emailHandlersPrivate.ts b/src/ches/emailHandlersPrivate.ts
@@ -25,7 +25,7 @@ export const sendEditRequestEmails = async (project, requestedProject) => {
       quotaChanged(project, requestedProject) &&
       !contactChanged(project, requestedProject)
     ) {
-      await chesService.send({
+        await chesService.send({
         bodyType: "html",
         body: swig.renderFile(
           "./src/ches/privateEmailTemplates/quota-request-received-email.html",

diff --git a/src/ches/emailHelpers.ts b/src/ches/emailHelpers.ts
@@ -153,7 +153,7 @@ export const generateEmailTemplatePrivateData = (
                 ? requestedProject.testQuota.cpu.cpuRequests
                 : null,
         testQuotaMemoryRequested:
-            requestedProject.testQuota.memoryRequests !==
+            requestedProject.testQuota.memory.memoryRequests !==
                 project.testQuota.memory.memoryRequests
                 ? requestedProject.testQuota.memory.memoryRequests
                 : null,
@@ -241,9 +241,9 @@ export const generateEmailTemplatePublicData = (
         : { ...incomingProject };
 
 
-        const secondaryTechnicalLead = (!!project.secondaryTechnicalLead || !!requestedProject.secondaryTechnicalLead) && requestedProject.secondaryTechnicalLead?.id !== project.secondaryTechnicalLead?.id
+    const secondaryTechnicalLead = (!!project.secondaryTechnicalLead || !!requestedProject.secondaryTechnicalLead) && requestedProject.secondaryTechnicalLead?.id !== project.secondaryTechnicalLead?.id
         ? project.secondaryTechnicalLead : !!requestedProject.secondaryTechnicalLead ? requestedProject.secondaryTechnicalLead : null;
-     const primaryTechnicalLead = project.primaryTechnicalLead;
+    const primaryTechnicalLead = project.primaryTechnicalLead;
     const projectOwner = project.projectOwner;
 
 
@@ -280,12 +280,12 @@ export const generateEmailTemplatePublicData = (
         BudgetProdReq: project.budget.prod,
         BudgetToolsReq: project.budget.tools,
         AccountCodingReq: project.accountCoding.replace(/(.{3})(.{5})(.{5})(.{4})(.{7})/g, "$1 $2 $3 $4 $5"),
-        isPOChanged: requestedProject.projectOwner.email !== project.projectOwner.email,        
+        isPOChanged: requestedProject.projectOwner.email !== project.projectOwner.email,
         POReq: requestedProject.projectOwner.email,
-        isPrimeTLChanged:requestedProject.primaryTechnicalLead.email!== project.primaryTechnicalLead.email,
-        PrimeTLReq:requestedProject.primaryTechnicalLead.email,
-        isSecTLChanged:requestedProject.secondaryTechnicalLead?requestedProject.secondaryTechnicalLead.email!== project.secondaryTechnicalLead.email:undefined,
-        SecTLReq:requestedProject.secondaryTechnicalLead?requestedProject.secondaryTechnicalLead.email:null,
+        isPrimeTLChanged: requestedProject.primaryTechnicalLead.email !== project.primaryTechnicalLead.email,
+        PrimeTLReq: requestedProject.primaryTechnicalLead.email,
+        isSecTLChanged: requestedProject.secondaryTechnicalLead?.email !== project.secondaryTechnicalLead?.email,
+        SecTLReq: requestedProject.secondaryTechnicalLead ? requestedProject.secondaryTechnicalLead.email : null,
         ...other,
     };
 };
diff --git a/src/ches/privateEmailTemplates/quota-and-tlpo-changes.html b/src/ches/privateEmailTemplates/quota-and-tlpo-changes.html
@@ -492,7 +492,7 @@
     </td>
   </tr>
 </table>
-{% if isDevelopmentQuotaChanged and testQuotaCPURequested%}
+{% if isTestQuotaChanged and testQuotaCPURequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>
@@ -543,7 +543,7 @@
   <![endif]-->
 </div>
 {% endif %}
-{% if isProductionQuotaChanged and testQuotaMemoryRequested%}
+{% if isTestQuotaChanged and testQuotaMemoryRequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>
@@ -594,7 +594,7 @@
   <![endif]-->
 </div>
 {% endif %}
-{% if isProductionQuotaChanged and testQuotaStorageRequested%}
+{% if isTestQuotaChanged and testQuotaStorageRequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>
@@ -1251,7 +1251,7 @@
     </td>
   </tr>
 </table>
-{% if isDevelopmentQuotaChanged and testQuotaCPURequested%}
+{% if isTestQuotaChanged and testQuotaCPURequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>
@@ -1302,7 +1302,7 @@
   <![endif]-->
 </div>
 {% endif %}
-{% if isProductionQuotaChanged and testQuotaMemoryRequested%}
+{% if isTestQuotaChanged and testQuotaMemoryRequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>
@@ -1353,7 +1353,7 @@
   <![endif]-->
 </div>
 {% endif %}
-{% if isProductionQuotaChanged and testQuotaStorageRequested%}
+{% if isTestQuotaChanged and testQuotaStorageRequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>

diff --git a/src/ches/privateEmailTemplates/quota-request-completion-email.html b/src/ches/privateEmailTemplates/quota-request-completion-email.html
@@ -530,7 +530,7 @@
     </td>
   </tr>
 </table>
-{% if isDevelopmentQuotaChanged and testQuotaCPURequested%}
+{% if isTestQuotaChanged and testQuotaCPURequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>
@@ -581,7 +581,7 @@
   <![endif]-->
 </div>
 {% endif %}
-{% if isProductionQuotaChanged and testQuotaMemoryRequested%}
+{% if isTestQuotaChanged and testQuotaMemoryRequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>
@@ -632,7 +632,7 @@
   <![endif]-->
 </div>
 {% endif %}
-{% if isProductionQuotaChanged and testQuotaStorageRequested%}
+{% if isTestQuotaChanged and testQuotaStorageRequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>

diff --git a/src/ches/privateEmailTemplates/quota-request-received-email.html b/src/ches/privateEmailTemplates/quota-request-received-email.html
@@ -474,7 +474,7 @@
                                   </td>
                                 </tr>
                               </table>
-                              {% if isDevelopmentQuotaChanged and testQuotaCPURequested%}
+                              {% if isTestQuotaChanged and testQuotaCPURequested%}
                               <div class="two-col"
                                 style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                 <!--[if mso]>
@@ -525,7 +525,7 @@
                                 <![endif]-->
                               </div>
                               {% endif %}
-                              {% if isProductionQuotaChanged and testQuotaMemoryRequested%}
+                              {% if isTestQuotaChanged and testQuotaMemoryRequested%}
                               <div class="two-col"
                                 style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                 <!--[if mso]>
@@ -576,7 +576,7 @@
                                 <![endif]-->
                               </div>
                               {% endif %}
-                              {% if isProductionQuotaChanged and testQuotaStorageRequested%}
+                              {% if isTestQuotaChanged and testQuotaStorageRequested%}
                               <div class="two-col"
                                 style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                 <!--[if mso]>
@@ -1233,7 +1233,7 @@
                                   </td>
                                 </tr>
                               </table>
-                              {% if isDevelopmentQuotaChanged and testQuotaCPURequested%}
+                              {% if isTestQuotaChanged and testQuotaCPURequested%}
                               <div class="two-col"
                                 style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                 <!--[if mso]>
@@ -1284,7 +1284,7 @@
                                 <![endif]-->
                               </div>
                               {% endif %}
-                              {% if isProductionQuotaChanged and testQuotaMemoryRequested%}
+                              {% if isTestQuotaChanged and testQuotaMemoryRequested%}
                               <div class="two-col"
                                 style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                 <!--[if mso]>
@@ -1335,7 +1335,7 @@
                                 <![endif]-->
                               </div>
                               {% endif %}
-                              {% if isProductionQuotaChanged and testQuotaStorageRequested%}
+                              {% if isTestQuotaChanged and testQuotaStorageRequested%}
                               <div class="two-col"
                                 style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                 <!--[if mso]>
@@ -1519,7 +1519,7 @@
                                 <![endif]-->
                               </div>
                               {% endif %}
-                              {% if isToolsQuotaChanged and toolsQuotaStorageRequested %}
+                              {% if testQuotaStorageRequested and toolsQuotaStorageRequested %}
                               <div class="two-col"
                                 style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                 <!--[if mso]>

diff --git a/src/ches/privateEmailTemplates/request-denial-email.html b/src/ches/privateEmailTemplates/request-denial-email.html
@@ -502,7 +502,7 @@
                                     </td>
                                  </tr>
                               </table>
-                              {% if isDevelopmentQuotaChanged and testQuotaCPURequested%}
+                              {% if isTestQuotaChanged and testQuotaCPURequested%}
                               <div class="two-col"
                                  style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                  <!--[if mso]>
@@ -552,7 +552,7 @@
                                  <![endif]-->
                               </div>
                               {% endif %}
-                              {% if isProductionQuotaChanged and testQuotaMemoryRequested%}
+                              {% if isTestQuotaChanged and testQuotaMemoryRequested%}
                               <div class="two-col"
                                  style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                  <!--[if mso]>
@@ -602,7 +602,7 @@
                                  <![endif]-->
                               </div>
                               {% endif %}
-                              {% if isProductionQuotaChanged and testQuotaStorageRequested%}
+                              {% if isTestQuotaChanged and testQuotaStorageRequested%}
                               <div class="two-col"
                                  style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                  <!--[if mso]>
@@ -1249,7 +1249,7 @@
                                     </td>
                                  </tr>
                               </table>
-                              {% if isDevelopmentQuotaChanged and testQuotaCPURequested%}
+                              {% if isTestQuotaChanged and testQuotaCPURequested%}
                               <div class="two-col"
                                  style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                  <!--[if mso]>
@@ -1299,7 +1299,7 @@
                                  <![endif]-->
                               </div>
                               {% endif %}
-                              {% if isProductionQuotaChanged and testQuotaMemoryRequested%}
+                              {% if isTestQuotaChanged and testQuotaMemoryRequested%}
                               <div class="two-col"
                                  style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                  <!--[if mso]>
@@ -1349,7 +1349,7 @@
                                  <![endif]-->
                               </div>
                               {% endif %}
-                              {% if isProductionQuotaChanged and testQuotaStorageRequested%}
+                              {% if isTestQuotaChanged and testQuotaStorageRequested%}
                               <div class="two-col"
                                  style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                  <!--[if mso]>

diff --git a/src/ches/privateEmailTemplates/super-admin-request-email.html b/src/ches/privateEmailTemplates/super-admin-request-email.html
@@ -470,7 +470,7 @@
     </td>
   </tr>
 </table>
-{% if isDevelopmentQuotaChanged and testQuotaCPURequested%}
+{% if isTestQuotaChanged and testQuotaCPURequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>
@@ -521,7 +521,7 @@
   <![endif]-->
 </div>
 {% endif %}
-{% if isProductionQuotaChanged and testQuotaMemoryRequested%}
+{% if isTestQuotaChanged and testQuotaMemoryRequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>
@@ -572,7 +572,7 @@
   <![endif]-->
 </div>
 {% endif %}
-{% if isProductionQuotaChanged and testQuotaStorageRequested%}
+{% if isTestQuotaChanged and testQuotaStorageRequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>
@@ -1229,7 +1229,7 @@
     </td>
   </tr>
 </table>
-{% if isDevelopmentQuotaChanged and testQuotaCPURequested%}
+{% if isTestQuotaChanged and testQuotaCPURequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>
@@ -1280,7 +1280,7 @@
   <![endif]-->
 </div>
 {% endif %}
-{% if isProductionQuotaChanged and testQuotaMemoryRequested%}
+{% if isTestQuotaChanged and testQuotaMemoryRequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>
@@ -1331,7 +1331,7 @@
   <![endif]-->
 </div>
 {% endif %}
-{% if isProductionQuotaChanged and testQuotaStorageRequested%}
+{% if isTestQuotaChanged and testQuotaStorageRequested%}
 <div class="two-col"
   style="text-align:center;font-size:0;background-color: #ffffff;  ">
   <!--[if mso]>

diff --git a/src/ches/publicEmailTemplates/edit-request-received.html b/src/ches/publicEmailTemplates/edit-request-received.html
@@ -408,7 +408,7 @@
                                             text-align:right;
                                             padding-right:10%;
                                             ">
-                                            {{ PrimeTLReq }}
+                                            {{ PriTLEmail }}
                                           </p>
                                         </div>
                                       </div>
@@ -419,7 +419,7 @@
                                 <![endif]-->
                               </div>
                               {% endif %} 
-                              {% if isSecTLChanged && SecTLEmail %}
+                              {% if isSecTLChanged %}
                               <div class="two-col"
                                 style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                 <!--[if mso]>
@@ -459,7 +459,7 @@
                                             text-align:right;
                                             padding-right:10%;
                                             ">
-                                            {{ SecTLReq }}
+                                            {{ SecTLEmail || "No Secondary Tech Lead" }}
                                           </p>
                                         </div>
                                       </div>
@@ -841,7 +841,7 @@
                                             text-align:right;
                                             padding-right:10%;
                                             ">
-                                            {{ PriTLEmail }}
+                                            {{ PrimeTLReq }}
                                           </p>
                                         </div>
                                       </div>
@@ -852,7 +852,7 @@
                                 <![endif]-->
                               </div>
                               {% endif %} 
-                              {% if isSecTLChanged && SecTLEmail %}
+                              {% if isSecTLChanged  %}
                               <div class="two-col"
                                 style="text-align:center;font-size:0;background-color: #ffffff;  ">
                                 <!--[if mso]>
@@ -892,7 +892,7 @@
                                             text-align:right;
                                             padding-right:10%;
                                             ">
-                                            {{ SecTLEmail }}
+                                            {{ SecTLReq || "No Secondary Tech Lead"}}
                                           </p>
                                         </div>
                                       </div>

diff --git a/src/controllers/getIdirEmails.ts b/src/controllers/getIdirEmails.ts
@@ -3,8 +3,7 @@ import { callMsGraph, getAccessToken } from '../msal/index.js';
 
 async function getIdirEmails(req, res) {
   const email = req.query.email;
-  const url = `https://graph.microsoft.com/v1.0/users?$filter=startswith(mail,'${email}')&$orderby=userPrincipalName&$count=true&$top=25`;
-
+  const url = `https://graph.microsoft.com/v1.0/users?$filter=startswith(mail,'${email}')and userType eq 'Member'&$orderby=userPrincipalName&$count=true&$top=25`;
   try {
     const accessToken = await getAccessToken();