@coopenomics/factory 2025.5.14 → 2025.6.13

package/dist/index.mjs

@@ -365,6 +365,285 @@ const VarsSchema = {
   additionalProperties: true
 };
 
+const MeetSchema = {
+  type: "object",
+  properties: {
+    id: { type: "string" },
+    hash: { type: "string" },
+    coopname: { type: "string" },
+    type: { type: "string" },
+    level: { type: "string" },
+    status: { type: "string" },
+    open_at: { type: "string" },
+    close_at: { type: "string" },
+    open_at_datetime: { type: "string" },
+    close_at_datetime: { type: "string" },
+    presider_full_name: { type: "string" },
+    secretary_full_name: { type: "string" },
+    initiator: { type: "string" },
+    presider: { type: "string" },
+    secretary: { type: "string" },
+    quorum_percent: { type: "number" },
+    signed_ballots: { type: "string" },
+    current_quorum_percent: { type: "number" },
+    cycle: { type: "string" },
+    notified_users: {
+      type: "array",
+      items: { type: "string" }
+    },
+    quorum_passed: { type: "boolean" },
+    created_at: { type: "string" },
+    proposal: {
+      type: "object",
+      properties: {
+        version: { type: "string" },
+        hash: { type: "string" },
+        doc_hash: { type: "string" },
+        meta_hash: { type: "string" },
+        meta: { type: "string" },
+        signatures: {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              id: { type: "number" },
+              signed_hash: { type: "string" },
+              signer: { type: "string" },
+              public_key: { type: "string" },
+              signature: { type: "string" },
+              signed_at: { type: "string" },
+              meta: { type: "string" }
+            },
+            required: ["id", "signed_hash", "signer", "public_key", "signature", "signed_at", "meta"],
+            additionalProperties: true
+          }
+        }
+      },
+      required: ["version", "hash", "doc_hash", "meta_hash", "meta", "signatures"],
+      additionalProperties: true
+    },
+    authorization: {
+      type: "object",
+      properties: {
+        version: { type: "string" },
+        hash: { type: "string" },
+        doc_hash: { type: "string" },
+        meta_hash: { type: "string" },
+        meta: { type: "string" },
+        signatures: {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              id: { type: "number" },
+              signed_hash: { type: "string" },
+              signer: { type: "string" },
+              public_key: { type: "string" },
+              signature: { type: "string" },
+              signed_at: { type: "string" },
+              meta: { type: "string" }
+            },
+            required: ["id", "signed_hash", "signer", "public_key", "signature", "signed_at", "meta"],
+            additionalProperties: true
+          }
+        }
+      },
+      required: ["version", "hash", "doc_hash", "meta_hash", "meta", "signatures"],
+      additionalProperties: true
+    },
+    decision1: {
+      type: "object",
+      properties: {
+        version: { type: "string" },
+        hash: { type: "string" },
+        doc_hash: { type: "string" },
+        meta_hash: { type: "string" },
+        meta: { type: "string" },
+        signatures: {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              id: { type: "number" },
+              signed_hash: { type: "string" },
+              signer: { type: "string" },
+              public_key: { type: "string" },
+              signature: { type: "string" },
+              signed_at: { type: "string" },
+              meta: { type: "string" }
+            },
+            required: ["id", "signed_hash", "signer", "public_key", "signature", "signed_at", "meta"],
+            additionalProperties: true
+          }
+        }
+      },
+      required: ["version", "hash", "doc_hash", "meta_hash", "meta", "signatures"],
+      additionalProperties: true
+    },
+    decision2: {
+      type: "object",
+      properties: {
+        version: { type: "string" },
+        hash: { type: "string" },
+        doc_hash: { type: "string" },
+        meta_hash: { type: "string" },
+        meta: { type: "string" },
+        signatures: {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              id: { type: "number" },
+              signed_hash: { type: "string" },
+              signer: { type: "string" },
+              public_key: { type: "string" },
+              signature: { type: "string" },
+              signed_at: { type: "string" },
+              meta: { type: "string" }
+            },
+            required: ["id", "signed_hash", "signer", "public_key", "signature", "signed_at", "meta"],
+            additionalProperties: true
+          }
+        }
+      },
+      required: ["version", "hash", "doc_hash", "meta_hash", "meta", "signatures"],
+      additionalProperties: true
+    }
+  },
+  required: [
+    "id",
+    "hash",
+    "coopname",
+    "type",
+    "status",
+    "open_at_datetime",
+    "close_at_datetime",
+    "presider_full_name",
+    "secretary_full_name"
+  ],
+  additionalProperties: true
+};
+const MeetPointSchema = {
+  type: "object",
+  properties: {
+    context: { type: "string" },
+    title: { type: "string" },
+    decision: { type: "string" }
+  },
+  required: ["context", "title", "decision"],
+  additionalProperties: true
+};
+const QuestionSchema$1 = {
+  type: "object",
+  properties: {
+    id: { type: "string" },
+    number: { type: "string" },
+    coopname: { type: "string" },
+    meet_id: { type: "string" },
+    title: { type: "string" },
+    context: { type: "string" },
+    decision: { type: "string" },
+    counter_votes_for: { type: "string" },
+    counter_votes_against: { type: "string" },
+    counter_votes_abstained: { type: "string" },
+    voters_for: { type: "array", items: { type: "string" } },
+    voters_against: { type: "array", items: { type: "string" } },
+    voters_abstained: { type: "array", items: { type: "string" } }
+  },
+  required: [
+    "id",
+    "number",
+    "coopname",
+    "meet_id",
+    "title",
+    "context",
+    "decision",
+    "counter_votes_for",
+    "counter_votes_against",
+    "counter_votes_abstained",
+    "voters_for",
+    "voters_against",
+    "voters_abstained"
+  ],
+  additionalProperties: true
+};
+const QuestionExtendedSchema = {
+  type: "object",
+  properties: {
+    id: { type: "string" },
+    number: { type: "string" },
+    coopname: { type: "string" },
+    meet_id: { type: "string" },
+    title: { type: "string" },
+    context: { type: "string" },
+    decision: { type: "string" },
+    counter_votes_for: { type: "string" },
+    counter_votes_against: { type: "string" },
+    counter_votes_abstained: { type: "string" },
+    voters_for: { type: "array", items: { type: "string" } },
+    voters_against: { type: "array", items: { type: "string" } },
+    voters_abstained: { type: "array", items: { type: "string" } },
+    votes_total: { type: "integer", nullable: true },
+    votes_for_percent: { type: "integer", nullable: true },
+    votes_against_percent: { type: "integer", nullable: true },
+    votes_abstained_percent: { type: "integer", nullable: true },
+    is_accepted: { type: "boolean", nullable: true }
+  },
+  required: [
+    "id",
+    "number",
+    "coopname",
+    "meet_id",
+    "title",
+    "context",
+    "decision",
+    "counter_votes_for",
+    "counter_votes_against",
+    "counter_votes_abstained",
+    "voters_for",
+    "voters_against",
+    "voters_abstained"
+  ],
+  additionalProperties: true
+};
+
+const CommonUserSchema = {
+  type: "object",
+  properties: {
+    full_name_or_short_name: { type: "string" },
+    birthdate_or_ogrn: { type: "string" },
+    abbr_full_name: { type: "string" }
+  },
+  required: ["full_name_or_short_name", "birthdate_or_ogrn", "abbr_full_name"],
+  additionalProperties: true
+};
+
+const AgendaMeetSchema = {
+  type: "object",
+  properties: {
+    type: { type: "string", enum: ["regular", "extra"] },
+    open_at_datetime: { type: "string" },
+    close_at_datetime: { type: "string" }
+  },
+  required: [
+    "type",
+    "open_at_datetime",
+    "close_at_datetime"
+  ],
+  additionalProperties: true
+};
+const AgendaQuestionSchema = {
+  type: "object",
+  properties: {
+    number: { type: "string" },
+    title: { type: "string" },
+    context: { type: "string", nullable: true },
+    decision: { type: "string" }
+  },
+  required: ["number", "title", "decision"],
+  additionalProperties: true
+};
+
 const registry_id$q = Cooperative$1.Registry.WalletAgreement.registry_id;
 const Schema$q = {
   type: "object",
@@ -904,17 +1183,6 @@ const CommonRequestSchema = {
   additionalProperties: true
 };
 
-const CommonUserSchema = {
-  type: "object",
-  properties: {
-    full_name_or_short_name: { type: "string" },
-    birthdate_or_ogrn: { type: "string" },
-    abbr_full_name: { type: "string" }
-  },
-  required: ["full_name_or_short_name", "birthdate_or_ogrn", "abbr_full_name"],
-  additionalProperties: true
-};
-
 const registry_id$g = Cooperative$1.Registry.AssetContributionStatement.registry_id;
 const Schema$g = {
   type: "object",
@@ -1404,9 +1672,15 @@ const Schema$4 = {
   properties: {
     meta: IMetaJSONSchema,
     coop: CooperativeSchema,
-    vars: VarsSchema
+    vars: VarsSchema,
+    meet: AgendaMeetSchema,
+    user: CommonUserSchema,
+    questions: {
+      type: "array",
+      items: AgendaQuestionSchema
+    }
   },
-  required: ["meta", "coop", "vars"],
+  required: ["meta", "coop", "vars", "meet", "user", "questions"],
   additionalProperties: true
 };
 const Template$4 = {
@@ -1430,9 +1704,15 @@ const Schema$3 = {
   properties: {
     meta: IMetaJSONSchema,
     coop: CooperativeSchema,
-    vars: VarsSchema
+    vars: VarsSchema,
+    decision: decisionSchema,
+    meet: MeetSchema,
+    questions: {
+      type: "array",
+      items: MeetPointSchema
+    }
   },
-  required: ["meta", "coop", "vars"],
+  required: ["meta", "coop", "vars", "decision", "meet", "questions"],
   additionalProperties: true
 };
 const Template$3 = {
@@ -1456,9 +1736,15 @@ const Schema$2 = {
   properties: {
     meta: IMetaJSONSchema,
     coop: CooperativeSchema,
-    vars: VarsSchema
+    vars: VarsSchema,
+    user: CommonUserSchema,
+    meet: MeetSchema,
+    questions: {
+      type: "array",
+      items: MeetPointSchema
+    }
   },
-  required: ["meta", "coop", "vars"],
+  required: ["meta", "coop", "vars", "meet", "questions", "user"],
   additionalProperties: true
 };
 const Template$2 = {
@@ -1476,15 +1762,49 @@ const AnnualGeneralMeetingNotification = {
   registry_id: registry_id$2
 };
 
+const AnswerSchema = {
+  type: "object",
+  properties: {
+    id: { type: "string" },
+    number: { type: "string" },
+    vote: { type: "string", enum: ["for", "against", "abstained"] }
+  },
+  required: ["id", "number", "vote"],
+  additionalProperties: true
+};
+const QuestionSchema = {
+  type: "object",
+  properties: {
+    id: { type: "string" },
+    number: { type: "string" },
+    title: { type: "string" },
+    context: { type: "string" },
+    decision: { type: "string" }
+  },
+  required: ["id", "number", "title", "context", "decision"],
+  additionalProperties: true
+};
 const registry_id$1 = Cooperative$1.Registry.AnnualGeneralMeetingVotingBallot.registry_id;
 const Schema$1 = {
   type: "object",
   properties: {
     meta: IMetaJSONSchema,
     coop: CooperativeSchema,
-    vars: VarsSchema
+    vars: VarsSchema,
+    meet: MeetSchema,
+    user: CommonUserSchema,
+    answers: {
+      type: "array",
+      items: AnswerSchema,
+      minItems: 1
+    },
+    questions: {
+      type: "array",
+      items: QuestionSchema,
+      minItems: 1
+    }
   },
-  required: ["meta", "coop", "vars"],
+  required: ["meta", "coop", "vars", "meet", "user", "answers", "questions"],
   additionalProperties: true
 };
 const Template$1 = {
@@ -1508,9 +1828,15 @@ const Schema = {
   properties: {
     meta: IMetaJSONSchema,
     coop: CooperativeSchema,
-    vars: VarsSchema
+    vars: VarsSchema,
+    decision: decisionSchema,
+    meet: MeetSchema,
+    questions: {
+      type: "array",
+      items: QuestionExtendedSchema
+    }
   },
-  required: ["meta", "coop", "vars"],
+  required: ["meta", "coop", "vars", "decision", "meet", "questions"],
   additionalProperties: true
 };
 const Template = {
@@ -2176,7 +2502,7 @@ class PDFService {
 
 const name = "@coopenomics/factory";
 const type = "module";
-const version = "2025.5.14";
+const version = "2025.6.13";
 const packageManager = "pnpm@9.0.6";
 const description = "";
 const author = "Alex Ant <chairman.voskhod@gmail.com>";
@@ -2226,7 +2552,7 @@ const dependencies = {
 	"ajv-formats": "^3.0.1",
 	"ajv-i18n": "^4.2.0",
 	axios: "^1.7.2",
-	cooptypes: "2025.5.14",
+	cooptypes: "2025.6.13",
 	dotenv: "^16.4.5",
 	"eosjs-ecc": "^4.0.7",
 	handlebars: "^4.7.8",
@@ -2267,7 +2593,7 @@ const pnpm = {
 		"vite@>=5.1.0 <=5.1.6": ">=5.1.7"
 	}
 };
-const gitHead = "515a374f86b8c38fa9e725072b3816782e5c734c";
+const gitHead = "4a5fb2af8b23629f9820d8364373210f3b7be665";
 const packageJson = {
 	name: name,
 	type: type,
@@ -2294,6 +2620,40 @@ const packageJson = {
 	gitHead: gitHead
 };
 
+function formatDateTime(timestamp) {
+  if (!timestamp)
+    return "";
+  const timezone = "Europe/Moscow";
+  let moscowDate;
+  if (timestamp.includes("T")) {
+    moscowDate = moment.utc(timestamp).tz(timezone);
+  } else if (!Number.isNaN(Number(timestamp))) {
+    moscowDate = moment.unix(Number(timestamp)).tz(timezone);
+  } else {
+    moscowDate = moment(timestamp).tz(timezone);
+  }
+  const months = [
+    "\u044F\u043D\u0432\u0430\u0440\u044F",
+    "\u0444\u0435\u0432\u0440\u0430\u043B\u044F",
+    "\u043C\u0430\u0440\u0442\u0430",
+    "\u0430\u043F\u0440\u0435\u043B\u044F",
+    "\u043C\u0430\u044F",
+    "\u0438\u044E\u043D\u044F",
+    "\u0438\u044E\u043B\u044F",
+    "\u0430\u0432\u0433\u0443\u0441\u0442\u0430",
+    "\u0441\u0435\u043D\u0442\u044F\u0431\u0440\u044F",
+    "\u043E\u043A\u0442\u044F\u0431\u0440\u044F",
+    "\u043D\u043E\u044F\u0431\u0440\u044F",
+    "\u0434\u0435\u043A\u0430\u0431\u0440\u044F"
+  ];
+  const day = moscowDate.date();
+  const month = months[moscowDate.month()];
+  const year = moscowDate.year();
+  const hours = moscowDate.format("HH");
+  const minutes = moscowDate.format("mm");
+  return `${day} ${month} ${year} ${hours}:${minutes} (\u041C\u0441\u043A)`;
+}
+
 var __defProp$2 = Object.defineProperty;
 var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$2 = (obj, key, value) => {
@@ -2390,6 +2750,22 @@ class DocFactory {
       name: "\u0421\u041E\u0421\u0415\u0414\u0418"
     };
   }
+  async getGeneralMeetingDecision(meet, created_at) {
+    const quorum_percent = Number(meet.current_quorum_percent);
+    const votes_for = 0;
+    const votes_against = 0;
+    const votes_abstained = 0;
+    const [date, time] = created_at.split(" ");
+    return {
+      id: Number(meet.id),
+      date,
+      time,
+      votes_for,
+      votes_against,
+      votes_abstained,
+      voters_percent: quorum_percent
+    };
+  }
   async getDecision(coop, coopname, decision_id, created_at) {
     const votes_for_actions = (await getFetch(`${getEnvVar("SIMPLE_EXPLORER_API")}/get-actions`, new URLSearchParams({
       filter: JSON.stringify({
@@ -2429,6 +2805,93 @@ class DocFactory {
       // decision,
     };
   }
+  async getMeet(coopname, meet_hash, block_num) {
+    const block_filter = block_num ? { block_num: { $lte: block_num } } : {};
+    const meetResponse = await getFetch(`${getEnvVar("SIMPLE_EXPLORER_API")}/get-tables`, new URLSearchParams({
+      filter: JSON.stringify({
+        "code": "meet",
+        "scope": coopname,
+        "table": "meets",
+        "value.hash": meet_hash.toUpperCase(),
+        ...block_filter
+      }),
+      limit: String(1)
+    }));
+    const meet = meetResponse.results[0]?.value;
+    if (!meet)
+      throw new Error("\u0421\u043E\u0431\u0440\u0430\u043D\u0438\u0435 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u043E");
+    const presiderData = await this.getUser(meet.presider, block_num);
+    const secretaryData = await this.getUser(meet.secretary, block_num);
+    const presiderFullName = this.getFullParticipantName(presiderData.data);
+    const secretaryFullName = this.getFullParticipantName(secretaryData.data);
+    const meetExtended = {
+      ...meet,
+      current_quorum_percent: Number(Number(meet.current_quorum_percent).toFixed(1)),
+      close_at_datetime: formatDateTime(meet.close_at),
+      open_at_datetime: formatDateTime(meet.open_at),
+      presider_full_name: presiderFullName,
+      secretary_full_name: secretaryFullName
+    };
+    return meetExtended;
+  }
+  async getMeetQuestions(coopname, meet_id, block_num) {
+    const block_filter = block_num ? { block_num: { $lte: block_num } } : {};
+    const questionsResponse = await getFetch(`${getEnvVar("SIMPLE_EXPLORER_API")}/get-tables`, new URLSearchParams({
+      filter: JSON.stringify({
+        "code": "meet",
+        "scope": coopname,
+        "table": "questions",
+        "value.meet_id": String(meet_id),
+        ...block_filter
+      })
+    }));
+    const questions = questionsResponse.results?.map((result) => result.value) || [];
+    questions.sort((a, b) => {
+      const numA = Number.parseInt(a.number.toString(), 10);
+      const numB = Number.parseInt(b.number.toString(), 10);
+      return numA - numB;
+    });
+    const extendedQuestions = questions.map((question) => {
+      const votesFor = Number(question.counter_votes_for);
+      const votesAgainst = Number(question.counter_votes_against);
+      const votesAbstained = Number(question.counter_votes_abstained);
+      const votesTotal = votesFor + votesAgainst + votesAbstained;
+      const calculatePercent = (value) => {
+        if (votesTotal === 0)
+          return 0;
+        return Math.round(value / votesTotal * 100);
+      };
+      const isAccepted = votesTotal > 0 && votesFor > votesTotal / 2;
+      return {
+        ...question,
+        votes_total: votesTotal,
+        votes_for_percent: calculatePercent(votesFor),
+        votes_against_percent: calculatePercent(votesAgainst),
+        votes_abstained_percent: calculatePercent(votesAbstained),
+        is_accepted: isAccepted
+      };
+    });
+    return extendedQuestions;
+  }
+  /**
+   * Определяет как пользователь проголосовал по конкретному вопросу
+   * @param question Вопрос голосования
+   * @param username Имя пользователя
+   * @returns 'for', 'against' или 'abstained'
+   */
+  getUserVote(question, username) {
+    console.log(question, username);
+    if (question.voters_for && question.voters_for.includes(username)) {
+      return "for";
+    }
+    if (question.voters_against && question.voters_against.includes(username)) {
+      return "against";
+    }
+    if (question.voters_abstained && question.voters_abstained.includes(username)) {
+      return "abstained";
+    }
+    return "abstained";
+  }
   async getTemplate(scope, registry_id, block_num) {
     const block_filter = block_num ? { block_num: { $lte: block_num } } : {};
     const templateResponse = await getFetch(`${getEnvVar("SIMPLE_EXPLORER_API")}/get-tables`, new URLSearchParams({
@@ -2512,7 +2975,7 @@ class DocFactory {
     };
   }
   extractOrganizationName(input) {
-    const regex = /^\s*(?:[А-ЯЁA-Za-z]{2,4}\s+)?["'«»“”]?([А-ЯЁа-яёA-Za-z0-9\- ]+(?:\s[А-ЯЁа-яёA-Za-z0-9\- ]+)*)["'«»“”]?\s*$/;
+    const regex = /^\s*(?:[А-ЯЁA-Za-z]{2,4}\s+)?["'«»]?([А-ЯЁа-яёA-Za-z0-9\- ]+(?:\s[А-ЯЁа-яёA-Za-z0-9\- ]+)*)["'«»]?\s*$/;
     const match = input.short_name.match(regex);
     if (!match) {
       throw new Error(`\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0438\u0437\u0432\u043B\u0435\u0447\u044C \u0438\u043C\u044F \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438 \u0438\u0437: "${input.short_name}"`);
@@ -3444,15 +3907,28 @@ let Factory$4 = class Factory extends DocFactory {
     const meta = await super.getMeta({ title: template.title, ...data });
     const coop = await super.getCooperative(data.coopname, data.block_num);
     const vars = await super.getVars(data.coopname, data.block_num);
-    const user = await super.getUser(data.username, data.block_num);
+    const userData = await super.getUser(data.username, data.block_num);
+    const user = super.getCommonUser(userData);
+    const meet = { ...data.meet };
+    const questions = [...data.questions];
     const combinedData = {
       meta,
       coop,
-      vars
+      vars,
+      meet,
+      questions,
+      user
     };
     await super.validate(combinedData, template.model);
     const translation = template.translations[meta.lang];
-    const document = await super.generatePDF(user.data, template.context, combinedData, translation, meta, options?.skip_save);
+    const document = await super.generatePDF(
+      user.full_name_or_short_name,
+      template.context,
+      combinedData,
+      translation,
+      meta,
+      options?.skip_save
+    );
     return document;
   }
 };
@@ -3471,15 +3947,27 @@ let Factory$3 = class Factory extends DocFactory {
     const meta = await super.getMeta({ title: template.title, ...data });
     const coop = await super.getCooperative(data.coopname, data.block_num);
     const vars = await super.getVars(data.coopname, data.block_num);
-    const user = await super.getUser(data.username, data.block_num);
+    const decision = await super.getDecision(coop, data.coopname, data.decision_id, meta.created_at);
+    const meet = await super.getMeet(data.coopname, data.meet_hash, data.block_num);
+    const questions = await super.getMeetQuestions(data.coopname, Number(meet.id), data.block_num);
     const combinedData = {
       meta,
       coop,
-      vars
+      vars,
+      decision,
+      meet,
+      questions
     };
     await super.validate(combinedData, template.model);
     const translation = template.translations[meta.lang];
-    const document = await super.generatePDF(user.data, template.context, combinedData, translation, meta, options?.skip_save);
+    const document = await super.generatePDF(
+      `${coop.chairman.last_name} ${coop.chairman.first_name} ${coop.chairman.middle_name}`,
+      template.context,
+      combinedData,
+      translation,
+      meta,
+      options?.skip_save
+    );
     return document;
   }
 };
@@ -3498,15 +3986,29 @@ let Factory$2 = class Factory extends DocFactory {
     const meta = await super.getMeta({ title: template.title, ...data });
     const coop = await super.getCooperative(data.coopname, data.block_num);
     const vars = await super.getVars(data.coopname, data.block_num);
-    const user = await super.getUser(data.username, data.block_num);
+    const meet = await super.getMeet(data.coopname, data.meet_hash, data.block_num);
+    const questions = await super.getMeetQuestions(data.coopname, Number(meet.id), data.block_num);
+    const userData = await super.getUser(meet.presider, data.block_num);
+    const user = super.getCommonUser(userData);
     const combinedData = {
       meta,
       coop,
-      vars
+      vars,
+      meet,
+      questions,
+      user
     };
+    console.log(combinedData);
     await super.validate(combinedData, template.model);
     const translation = template.translations[meta.lang];
-    const document = await super.generatePDF(user.data, template.context, combinedData, translation, meta, options?.skip_save);
+    const document = await super.generatePDF(
+      user.full_name_or_short_name,
+      template.context,
+      combinedData,
+      translation,
+      meta,
+      options?.skip_save
+    );
     return document;
   }
 };
@@ -3525,15 +4027,39 @@ let Factory$1 = class Factory extends DocFactory {
     const meta = await super.getMeta({ title: template.title, ...data });
     const coop = await super.getCooperative(data.coopname, data.block_num);
     const vars = await super.getVars(data.coopname, data.block_num);
-    const user = await super.getUser(data.username, data.block_num);
+    const userData = await super.getUser(data.username, data.block_num);
+    const user = super.getCommonUser(userData);
+    const meet = await super.getMeet(data.coopname, data.meet_hash, data.block_num);
+    const meetQuestions = await super.getMeetQuestions(data.coopname, Number(meet.id), data.block_num);
+    console.log("meetQuestions", meetQuestions);
+    const questions = meetQuestions.map((question) => ({
+      id: question.id.toString(),
+      number: question.number.toString(),
+      title: question.title,
+      context: question.context || "",
+      decision: question.decision
+    }));
+    const { answers } = data;
     const combinedData = {
       meta,
       coop,
-      vars
+      vars,
+      user,
+      meet,
+      answers,
+      questions
     };
+    console.dir(combinedData, { depth: null });
     await super.validate(combinedData, template.model);
     const translation = template.translations[meta.lang];
-    const document = await super.generatePDF(user.data, template.context, combinedData, translation, meta, options?.skip_save);
+    const document = await super.generatePDF(
+      user.full_name_or_short_name,
+      template.context,
+      combinedData,
+      translation,
+      meta,
+      options?.skip_save
+    );
     return document;
   }
 };
@@ -3552,15 +4078,27 @@ class Factory extends DocFactory {
     const meta = await super.getMeta({ title: template.title, ...data });
     const coop = await super.getCooperative(data.coopname, data.block_num);
     const vars = await super.getVars(data.coopname, data.block_num);
-    const user = await super.getUser(data.username, data.block_num);
+    const meet = await super.getMeet(data.coopname, data.meet_hash, data.block_num);
+    const questions = await super.getMeetQuestions(data.coopname, Number(meet.id), data.block_num);
+    const decision = await super.getGeneralMeetingDecision(meet, meta.created_at);
     const combinedData = {
       meta,
       coop,
-      vars
+      vars,
+      decision,
+      meet,
+      questions
     };
     await super.validate(combinedData, template.model);
     const translation = template.translations[meta.lang];
-    const document = await super.generatePDF(user.data, template.context, combinedData, translation, meta, options?.skip_save);
+    const document = await super.generatePDF(
+      `${meet.presider} / ${meet.secretary}`,
+      template.context,
+      combinedData,
+      translation,
+      meta,
+      options?.skip_save
+    );
     return document;
   }
 }
@@ -3746,4 +4284,4 @@ class Generator {
   }
 }
 
-export { AnnualGeneralMeetingAgenda, AnnualGeneralMeetingDecision, AnnualGeneralMeetingNotification, AnnualGeneralMeetingSovietDecision, AnnualGeneralMeetingVotingBallot, AssetContributionAct, AssetContributionDecision, AssetContributionStatement, BankAccountSchema, CoopenomicsAgreement, CooperativeSchema, DecisionOfParticipantApplication, FreeDecision, Generator, InvestByMoneyStatement, InvestByResultAct, InvestByResultStatement, InvestMembershipConvertation, InvestmentAgreement, ParticipantApplication, PrivacyPolicy, ProjectFreeDecision, Registry, RegulationElectronicSignaturet as RegulationElectronicSignature, ReturnByAssetAct, ReturnByAssetDecision, ReturnByAssetStatement, SelectBranchStatement, SosediAgreement, UserAgreement, VarsSchema, WalletAgreement, decisionSchema, entrepreneurSchema, individualSchema, organizationSchema, paymentMethodSchema };
+export { AgendaMeetSchema, AgendaQuestionSchema, AnnualGeneralMeetingAgenda, AnnualGeneralMeetingDecision, AnnualGeneralMeetingNotification, AnnualGeneralMeetingSovietDecision, AnnualGeneralMeetingVotingBallot, AssetContributionAct, AssetContributionDecision, AssetContributionStatement, BankAccountSchema, CommonUserSchema, CoopenomicsAgreement, CooperativeSchema, DecisionOfParticipantApplication, FreeDecision, Generator, InvestByMoneyStatement, InvestByResultAct, InvestByResultStatement, InvestMembershipConvertation, InvestmentAgreement, MeetPointSchema, MeetSchema, ParticipantApplication, PrivacyPolicy, ProjectFreeDecision, QuestionExtendedSchema, QuestionSchema$1 as QuestionSchema, Registry, RegulationElectronicSignaturet as RegulationElectronicSignature, ReturnByAssetAct, ReturnByAssetDecision, ReturnByAssetStatement, SelectBranchStatement, SosediAgreement, UserAgreement, VarsSchema, WalletAgreement, decisionSchema, entrepreneurSchema, individualSchema, organizationSchema, paymentMethodSchema };