Merge branch 'main' into fix-unknown

cap-js · Nov 7, 2024 · 8d85193 · 8d85193
2 parents 4421ee7 + 9bbb1b1
commit 8d85193
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -249,20 +249,29 @@ const addDataSubjectForDetailsEntity = (row, log, req, entity, model) => {
   else map.set(role, _getDataSubjectIdQuery(dataSubjectInfo, row, model))
 }
 
-const resolveDataSubjects = async (logs, req) => {
+const resolveDataSubjects = (logs, req) => {
+  const ps = []
+
   const map = _getDataSubjectsMap(req)
+
   for (const each of Object.values(logs)) {
     if (each.data_subject.id instanceof cds.ql.Query) {
       const q = each.data_subject.id
-      if (map.has(q)) {
-        each.data_subject.id = map.get(q)
-      } else {
-        const res = await q
-        map.set(q, res)
-        each.data_subject.id = res
+      if (!map.has(q)) {
+        const p = cds.run(q).then(res => map.set(q, res))
+        map.set(q, p)
+        ps.push(p)
       }
     }
   }
+
+  return Promise.all(ps).then(() => {
+    for (const each of Object.values(logs)) {
+      if (each.data_subject.id instanceof cds.ql.Query) {
+        each.data_subject.id = map.get(each.data_subject.id)
+      }
+    }
+  })
 }
 
 module.exports = {