Merge pull request #252 from IntersectMBO/main

nebojsact · web-flow · commit 07cf1f1ebc5d · 2025-05-15T10:38:19.000+02:00
Fix dev branch from main
diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
@@ -36,10 +36,11 @@ jobs:
       - name: Set TAG Environment Variable
         id: set_tag
         run: |
+          BUILD_NUMBER=${{ github.run_number }}
           if [ "${{ github.ref_name }}" = "main" ]; then
-            echo "TAG=${{ github.sha }}" >> $GITHUB_ENV
+            echo "TAG=${{ github.sha }}-${BUILD_NUMBER}" >> $GITHUB_ENV
           else
-            echo "TAG=${{ github.ref_name }}-${{ github.sha }}" >> $GITHUB_ENV
+            echo "TAG=${{ github.ref_name }}-${{ github.sha }}-${BUILD_NUMBER}" >> $GITHUB_ENV
           fi
 
       - name: Lint Dockerfile
diff --git a/backend/src/api/bd-contact-information/content-types/bd-contact-information/lifecycles.js b/backend/src/api/bd-contact-information/content-types/bd-contact-information/lifecycles.js
@@ -0,0 +1,50 @@
+const { ValidationError } = require('@strapi/utils').errors;
+
+async function isLocked(contactInfoId) {
+  if (!contactInfoId) return false;
+
+  const relatedBds = await strapi.entityService.findMany('api::bd.bd', {
+    filters: {
+      bd_contact_information: contactInfoId,
+    },
+    fields: ['id', 'submitted_for_vote'],
+  });
+
+  return relatedBds.some(bd => !!bd.submitted_for_vote);
+}
+
+module.exports = {
+  async beforeUpdate(event) {
+    const { where } = event.params;
+    const isVotingLocked = await isLocked(where.id);
+    if (isVotingLocked) {
+      throw new ValidationError('Cannot update contact information because related proposal has already been submitted for voting.');
+    }
+  },
+
+  async beforeDelete(event) {
+    const { where } = event.params;
+    const isVotingLocked = await isLocked(where.id);
+    if (isVotingLocked) {
+      throw new ValidationError('Cannot delete contact information because related proposal has already been submitted for voting.');
+    }
+  },
+
+  async beforeCreate(event) {
+    const { data } = event.params;
+
+    if (!data) return;
+
+    const bdId = data.bd; 
+
+    if (!bdId) return;
+
+    const relatedBd = await strapi.entityService.findOne('api::bd.bd', bdId, {
+      fields: ['submitted_for_vote'],
+    });
+
+    if (relatedBd?.submitted_for_vote) {
+      throw new ValidationError('Cannot create contact information because related proposal has already been submitted for voting.');
+    }
+  },
+};
diff --git a/backend/src/api/bd-costing/content-types/bd-costing/lifecycles.js b/backend/src/api/bd-costing/content-types/bd-costing/lifecycles.js
@@ -0,0 +1,47 @@
+const { ValidationError } = require('@strapi/utils').errors;
+
+async function isLocked(costingId) {
+  if (!costingId) return false;
+  const relatedBds = await strapi.entityService.findMany('api::bd.bd', {
+    filters: {
+      bd_costing: costingId,
+    },
+    fields: ['id', 'submitted_for_vote'],
+  });
+  return relatedBds.some(bd => !!bd.submitted_for_vote);
+}
+
+module.exports = {
+  async beforeUpdate(event) {
+    const { where } = event.params;
+    const isVotingLocked = await isLocked(where.id);
+    if (isVotingLocked) {
+      throw new ValidationError('Cannot update costing because related proposal has already been submitted for voting.');
+    }
+  },
+
+  async beforeDelete(event) {
+    const { where } = event.params;
+    const isVotingLocked = await isLocked(where.id);
+    if (isVotingLocked) {
+      throw new ValidationError('Cannot delete costing because related proposal has already been submitted for voting.');
+    }
+  },
+
+  async beforeCreate(event) {
+    const { data } = event.params;
+    if (!data) return;
+
+    const bdId = data.bd; 
+
+    if (!bdId) return;
+
+    const relatedBd = await strapi.entityService.findOne('api::bd.bd', bdId, {
+      fields: ['submitted_for_vote'],
+    });
+
+    if (relatedBd?.submitted_for_vote) {
+      throw new ValidationError('Cannot create costing because related proposal has already been submitted for voting.');
+    }
+  },
+};
diff --git a/backend/src/api/bd-further-information/content-types/bd-further-information/lifecycles.js b/backend/src/api/bd-further-information/content-types/bd-further-information/lifecycles.js
@@ -0,0 +1,32 @@
+const { ValidationError } = require('@strapi/utils').errors;
+
+async function isLocked(furtherInfoId) {
+  if (!furtherInfoId) return false;
+
+  const relatedBds = await strapi.entityService.findMany('api::bd.bd', {
+    filters: {
+      bd_further_information: furtherInfoId,
+    },
+    fields: ['id', 'submitted_for_vote'],
+  });
+
+  return relatedBds.some(bd => !!bd.submitted_for_vote);
+}
+
+module.exports = {
+  async beforeUpdate(event) {
+    const { where } = event.params;
+    const isVotingLocked = await isLocked(where.id);
+    if (isVotingLocked) {
+      throw new ValidationError('Cannot update further information because related proposal has already been submitted for voting.');
+    }
+  },
+
+  async beforeDelete(event) {
+    const { where } = event.params;
+    const isVotingLocked = await isLocked(where.id);
+    if (isVotingLocked) {
+      throw new ValidationError('Cannot delete further information because related proposal has already been submitted for voting.');
+    }
+  },
+};
diff --git a/backend/src/api/bd-poll-vote/content-types/bd-poll-vote/lifecycles.js b/backend/src/api/bd-poll-vote/content-types/bd-poll-vote/lifecycles.js
@@ -0,0 +1,55 @@
+const { ValidationError } = require('@strapi/utils').errors;
+
+async function isVotingLockedFromPoolId(bd_poll_id) {
+    if (!bd_poll_id) return false;
+  
+    const pool = await strapi.entityService.findOne('api::bd-poll.bd-poll', bd_poll_id, {
+      fields: ['bd_proposal_id'],
+    });
+  
+    const bdId = pool?.bd_proposal_id;
+    if (!bdId) return false;
+  
+    const bd = await strapi.entityService.findOne('api::bd.bd', bdId, {
+      fields: ['submitted_for_vote'],
+    });
+  
+    return !!bd?.submitted_for_vote;
+  }
+  
+
+module.exports = {
+  async beforeCreate(event) {
+    const { data } = event.params;
+    const isLocked = await isVotingLockedFromPoolId(data.bd_poll_id);
+    if (isLocked) {
+      throw new ValidationError('Creating poll votes is not allowed after the proposal has been submitted for voting.');
+    }
+  },
+
+  async beforeUpdate(event) {
+    const { where } = event.params;
+
+    const voteEntry = await strapi.entityService.findOne('api::bd-poll-vote.bd-poll-vote', where.id, {
+      fields: ['bd_poll_id'],
+    });
+
+    const isLocked = await isVotingLockedFromPoolId(voteEntry?.bd_poll_id);
+    if (isLocked) {
+      throw new ValidationError('Modifying poll votes is not allowed after the proposal has been submitted for voting.');
+    }
+  },
+
+  async beforeDelete(event) {
+    const { where } = event.params;
+
+    const voteEntry = await strapi.entityService.findOne('api::bd-poll-vote.bd-poll-vote', where.id, {
+      fields: ['bd_poll_id'],
+    });
+
+    const isLocked = await isVotingLockedFromPoolId(voteEntry?.bd_poll_id);
+    if (isLocked) {
+      throw new ValidationError('Deleting poll votes is not allowed after the proposal has been submitted for voting.');
+    }
+  },
+};
diff --git a/backend/src/api/bd-poll/content-types/bd-poll/lifecycles.js b/backend/src/api/bd-poll/content-types/bd-poll/lifecycles.js
@@ -0,0 +1,44 @@
+const { ValidationError } = require('@strapi/utils').errors;
+
+module.exports = {
+  async beforeUpdate(event) {
+    const { where } = event.params;
+
+    const existingPool = await strapi.entityService.findOne('api::bd-pool.bd-pool', where.id, {
+      fields: ['bd_proposal_id'],
+    });
+    const bdId = existingPool?.bd_proposal_id;
+    if (!bdId) return; 
+    const relatedBd = await strapi.entityService.findOne('api::bd.bd', bdId, {
+      fields: ['submitted_for_vote'],
+    });
+    if (relatedBd?.submitted_for_vote) {
+      throw new ValidationError('Update is not allowed because the related BD entry has already been submitted for voting.');
+    }
+  },
+  async beforeDelete(event) {
+    const { where } = event.params;
+    const existingPool = await strapi.entityService.findOne('api::bd-pool.bd-pool', where.id, {
+      fields: ['bd_proposal_id'],
+    });
+    const bdId = existingPool?.bd_proposal_id;
+    if (!bdId) return; 
+    const relatedBd = await strapi.entityService.findOne('api::bd.bd', bdId, {
+      fields: ['submitted_for_vote'],
+    });
+    if (relatedBd?.submitted_for_vote) {
+      throw new ValidationError('Deletion is not allowed because the related BD entry has already been submitted for voting.');
+    }
+  },
+  async beforeCreate(event) {
+    const { data } = event;
+    const bdId = data.bd_proposal_id;
+    if (!bdId) return; 
+    const relatedBd = await strapi.entityService.findOne('api::bd.bd', bdId, {
+      fields: ['submitted_for_vote'],
+    });
+    if (relatedBd?.submitted_for_vote) {
+      throw new ValidationError('Creation is not allowed because the related BD entry has already been submitted for voting.');
+    }
+  },
+};
diff --git a/backend/src/api/bd-proposal-detail/content-types/bd-proposal-detail/lifecycles.js b/backend/src/api/bd-proposal-detail/content-types/bd-proposal-detail/lifecycles.js
@@ -0,0 +1,32 @@
+const { ValidationError } = require('@strapi/utils').errors;
+
+async function isLocked(detailId) {
+  if (!detailId) return false;
+
+  const relatedBds = await strapi.entityService.findMany('api::bd.bd', {
+    filters: {
+      bd_proposal_detail: detailId,
+    },
+    fields: ['id', 'submitted_for_vote'],
+  });
+
+  return relatedBds.some(bd => !!bd.submitted_for_vote);
+}
+
+module.exports = {
+  async beforeUpdate(event) {
+    const { where } = event.params;
+    const isVotingLocked = await isLocked(where.id);
+    if (isVotingLocked) {
+      throw new ValidationError('Cannot update proposal detail because related proposal has already been submitted for voting.');
+    }
+  },
+
+  async beforeDelete(event) {
+    const { where } = event.params;
+    const isVotingLocked = await isLocked(where.id);
+    if (isVotingLocked) {
+      throw new ValidationError('Cannot delete proposal detail because related proposal has already been submitted for voting.');
+    }
+  }
+};
diff --git a/backend/src/api/bd-proposal-ownership/content-types/bd-proposal-ownership/lifecycles.js b/backend/src/api/bd-proposal-ownership/content-types/bd-proposal-ownership/lifecycles.js
@@ -0,0 +1,32 @@
+const { ValidationError } = require('@strapi/utils').errors;
+
+async function isLocked(ownershipId) {
+  if (!ownershipId) return false;
+
+  const relatedBds = await strapi.entityService.findMany('api::bd.bd', {
+    filters: {
+      bd_proposal_ownership: ownershipId,
+    },
+    fields: ['id', 'submitted_for_vote'],
+  });
+
+  return relatedBds.some(bd => !!bd.submitted_for_vote);
+}
+
+module.exports = {
+  async beforeUpdate(event) {
+    const { where } = event.params;
+    const isVotingLocked = await isLocked(where.id);
+    if (isVotingLocked) {
+      throw new ValidationError('Cannot update proposal ownership because related proposal has already been submitted for voting.');
+    }
+  },
+
+  async beforeDelete(event) {
+    const { where } = event.params;
+    const isVotingLocked = await isLocked(where.id);
+    if (isVotingLocked) {
+      throw new ValidationError('Cannot delete proposal ownership because related proposal has already been submitted for voting.');
+    }
+  },
+};
diff --git a/backend/src/api/bd-psapb/content-types/bd-psapb/lifecycles.js b/backend/src/api/bd-psapb/content-types/bd-psapb/lifecycles.js
@@ -0,0 +1,32 @@
+const { ValidationError } = require('@strapi/utils').errors;
+
+async function isLocked(psapbId) {
+  if (!psapbId) return false;
+
+  const relatedBds = await strapi.entityService.findMany('api::bd.bd', {
+    filters: {
+      bd_psapb: psapbId,
+    },
+    fields: ['id', 'submitted_for_vote'],
+  });
+
+  return relatedBds.some(bd => !!bd.submitted_for_vote);
+}
+
+module.exports = {
+  async beforeUpdate(event) {
+    const { where } = event.params;
+    const isVotingLocked = await isLocked(where.id);
+    if (isVotingLocked) {
+      throw new ValidationError('Cannot update PSAPB section because related proposal has already been submitted for voting.');
+    }
+  },
+
+  async beforeDelete(event) {
+    const { where } = event.params;
+    const isVotingLocked = await isLocked(where.id);
+    if (isVotingLocked) {
+      throw new ValidationError('Cannot delete PSAPB section because related proposal has already been submitted for voting.');
+    }
+  },
+};
diff --git a/backend/src/api/bd/content-types/bd/lifecycles.js b/backend/src/api/bd/content-types/bd/lifecycles.js
diff --git a/backend/src/api/bd/content-types/bd/schema.json b/backend/src/api/bd/content-types/bd/schema.json
diff --git a/pdf-ui/src/components/BudgetDiscussionCard/index.jsx b/pdf-ui/src/components/BudgetDiscussionCard/index.jsx
diff --git a/pdf-ui/src/pages/BudgetDiscussion/SingleBudgetDiscussion/index.jsx b/pdf-ui/src/pages/BudgetDiscussion/SingleBudgetDiscussion/index.jsx
