chore(release): publish

- cooparser-ts@1.0.19-alpha.1
 - coopback@1.7.35-alpha.2
 - coopdoc-generator-ts@1.0.79-alpha.2
 - cooptypes@1.0.22-alpha.2
 - coop-notificator@0.0.26-alpha.2
 - terminal@0.1.39-alpha.2

.dockerignore

@@ -0,0 +1,3 @@
+node_modules
+dist
+

.vscode/settings.json

@@ -0,0 +1,14 @@
+{
+  "editor.bracketPairColorization.enabled": true,
+  "editor.guides.bracketPairs": true,
+  "editor.formatOnSave": true,
+  "editor.tabCompletion": "onlySnippets",
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.codeActionsOnSave": ["source.fixAll.eslint"],
+  "eslint.validate": ["javascript", "typescript", "vue"],
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "i18n-ally.localesPaths": ["src/i18n"],
+  "typescript.format.enable": true,
+  "typescript.format.indentSwitchCase": false,
+  "typescript.validate.enable": true,
+}

Dockerfile

@@ -0,0 +1,10 @@
+FROM node:18-alpine
+
+WORKDIR /app
+
+COPY . .
+
+RUN npm install -g pnpm lerna
+RUN pnpm install
+RUN lerna run build
+

components/cooparser/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.0.18](https://github.com/copenomics/cooparser/compare/cooparser-ts@1.0.17...cooparser-ts@1.0.18) (2024-08-25)
+
+**Note:** Version bump only for package cooparser-ts
+
+
+
+
+
 ## [1.0.17](https://github.com/copenomics/cooparser/compare/cooparser-ts@1.0.17-alpha.2...cooparser-ts@1.0.17) (2024-07-25)
 
 **Note:** Version bump only for package cooparser-ts

components/cooparser/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "pkg-placeholder",
-  "version": "1.0.17",
+  "version": "1.0.19-alpha.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "pkg-placeholder",
-      "version": "1.0.17",
+      "version": "1.0.19-alpha.1",
       "license": "MIT",
       "devDependencies": {
         "@antfu/eslint-config": "^2.16.0",

components/cooparser/package.json

@@ -1,8 +1,8 @@
 {
   "name": "cooparser-ts",
   "type": "module",
-  "version": "1.0.17",
-  "private": true,
+  "version": "1.0.19-alpha.1",
+  "private": false,
   "packageManager": "pnpm@9.0.6",
   "description": "",
   "author": "Alex Ant <dacom.dark.sun@gmail.com>",

components/cooparser/src/BlockParser/Parser/BlockParser.ts

@@ -14,6 +14,7 @@ export async function BlockParser(db: Database, reader: EosioShipReaderResolved)
     setTimeout(() => process.exit(1), 10000)
   })
 
+
   blocks$.subscribe(async (block: IBlock) => {
     // console.log('new block: ', block)
     // process.stdout.write('\r') // Возврат каретки в начало строки

components/cooparser/src/Database/index.ts

@@ -11,7 +11,6 @@ export class Database {
   private sync: Collection | undefined
 
   constructor() {
-    console.log('mongo2: ', mongoUri)
     this.client = new MongoClient(mongoUri)
   }
 

components/cooparser/src/config.ts

@@ -11,7 +11,6 @@ function getEnvVar(key: string): string {
   return envVar
 }
 export const node_env = getEnvVar('NODE_ENV')
-console.log('ENV: ', node_env)
 export const eosioApi = getEnvVar('API')
 export const shipApi = getEnvVar('SHIP')
 export const mongoUri = `${getEnvVar('MONGO_EXPLORER_URI')}${node_env === 'test' ? '-test' : ''}`

components/coopback/.eslintrc.json

@@ -18,7 +18,7 @@
     "project": "./tsconfig.json"
   },
   "rules": {
-    "no-console": "error",
+    "no-console": "warn",
     "func-names": "off",
     "no-underscore-dangle": "off",
     "consistent-return": "off",

components/coopback/.vscode/settings.json

@@ -1,5 +1,8 @@
 {
   "cSpell.words": [
     "subcode"
-  ]
+  ],
+  "editor.formatOnSave": true,
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "editor.defaultFormatter": "esbenp.prettier-vscode"
 }

components/coopback/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.7.34](https://github.com/hagopj13/node-express-boilerplate/compare/coopback@1.7.33...coopback@1.7.34) (2024-08-25)
+
+**Note:** Version bump only for package coopback
+
+
+
+
+
+## [1.7.33](https://github.com/hagopj13/node-express-boilerplate/compare/coopback@1.7.32...coopback@1.7.33) (2024-08-25)
+
+**Note:** Version bump only for package coopback
+
+
+
+
+
+## [1.7.32](https://github.com/hagopj13/node-express-boilerplate/compare/coopback@1.7.31...coopback@1.7.32) (2024-08-25)
+
+**Note:** Version bump only for package coopback
+
+
+
+
+
+## [1.7.31](https://github.com/hagopj13/node-express-boilerplate/compare/coopback@1.7.31-alpha.1...coopback@1.7.31) (2024-08-25)
+
+**Note:** Version bump only for package coopback
+
+
+
+
+
+## [1.7.30](https://github.com/hagopj13/node-express-boilerplate/compare/coopback@1.7.29...coopback@1.7.30) (2024-08-13)
+
+**Note:** Version bump only for package coopback
+
+
+
+
+
 ## [1.7.29](https://github.com/hagopj13/node-express-boilerplate/compare/coopback@1.7.29-alpha.0...coopback@1.7.29) (2024-08-05)
 
 **Note:** Version bump only for package coopback

components/coopback/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "create-nodejs-express-app",
-  "version": "1.7.29",
+  "version": "1.7.35-alpha.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "create-nodejs-express-app",
-      "version": "1.7.29",
+      "version": "1.7.35-alpha.2",
       "license": "MIT",
       "dependencies": {
         "@a2seven/yoo-checkout": "^1.1.4",

components/coopback/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coopback",
-  "version": "1.7.29",
+  "version": "1.7.35-alpha.2",
   "description": "",
   "private": true,
   "bin": "bin/createNodejsApp.js",

components/coopback/scripts/createServiceUser.ts

@@ -17,12 +17,11 @@ const [username] = args;
 async function createServiceUser(username: string) {
   try {
     await mongoose.connect(config.mongoose.url, config.mongoose.options);
-
     const user = await userService.createServiceUser(username);
     const token = await tokenService.generateServiceAccessToken(user);
-    logger.log('token:', token.access.token);
+    console.log('token:', token.access.token);
   } catch (e: any) {
-    logger.log('Ошибка: ', e.message);
+    logger.error('Ошибка: ', e.message);
   }
 
   process.exit(0);

components/coopback/scripts/deleteUser.ts

@@ -17,7 +17,7 @@ async function deleteUser(username: string) {
   try {
     await mongoose.connect(config.mongoose.url, config.mongoose.options);
 
-    await userService.deleteUserById(username);
+    await userService.deleteUserByUsername(username);
 
     console.log('Пользователь удалён: ', username);
   } catch (e: any) {

components/coopback/scripts/init.ts

@@ -15,17 +15,12 @@ async function init() {
 
     await mongoose.connect(config.mongoose.url, config.mongoose.options);
     const wif = '5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3';
-    const password = await crypto.createHash('sha256').update(wif).digest('hex');
-    const hashed_password = await hash(password, 8);
-
-    console.log('password: ', hashed_password);
 
     await userService.createUser({
       username: 'ant',
       email: 'dacom.dark.sun@gmail.com',
-      password,
       public_key: 'EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV',
-      role: 'chairman',
+      role: 'user',
       type: 'individual',
       individual_data: {
         first_name: 'Иван',
@@ -46,7 +41,6 @@ async function init() {
     const voskhod = await userService.createUser({
       username: 'voskhod',
       email: 'chairman.voskhod@gmail.com',
-      password,
       public_key: 'EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV',
       role: 'user',
       type: 'organization',

components/coopback/src/config/config.ts

@@ -21,6 +21,9 @@ const envVarsSchema = Joi.object()
     JWT_VERIFY_EMAIL_EXPIRATION_MINUTES: Joi.number()
       .default(10)
       .description('minutes after which verify email token expires'),
+
+    JWT_INVITE_EXPIRATION_MINUTES: Joi.number().default(3600).description('minutes after invite token expires'),
+
     SMTP_HOST: Joi.string().description('server that will send the emails'),
     SMTP_PORT: Joi.number().description('port to connect to the email server'),
     SMTP_USERNAME: Joi.string().description('username for email server'),
@@ -57,6 +60,7 @@ export default {
     refreshExpirationDays: envVars.JWT_REFRESH_EXPIRATION_DAYS,
     resetPasswordExpirationMinutes: envVars.JWT_RESET_PASSWORD_EXPIRATION_MINUTES,
     verifyEmailExpirationMinutes: envVars.JWT_VERIFY_EMAIL_EXPIRATION_MINUTES,
+    inviteExpirationMinutes: envVars.JWT_INVITE_EXPIRATION_MINUTES,
   },
   email: {
     smtp: {

components/coopback/src/config/passport.ts

@@ -1,9 +1,8 @@
-import {Strategy as JwtStrategy, ExtractJwt } from 'passport-jwt'
-import config from './config'
+import { Strategy as JwtStrategy, ExtractJwt } from 'passport-jwt';
+import config from './config';
 import { tokenTypes } from './tokens';
 import { User } from '../models';
 
-
 const jwtOptions = {
   secretOrKey: config.jwt.secret,
   jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
@@ -14,7 +13,7 @@ const jwtVerify = async (payload, done) => {
     if (payload.type !== tokenTypes.ACCESS) {
       throw new Error('Invalid token type');
     }
-    const user = await User.findOne({_id: payload.sub});
+    const user = await User.findOne({ _id: payload.sub });
     if (!user) {
       return done(null, false);
     }

components/coopback/src/config/roles.ts

@@ -1,7 +1,7 @@
 const allRoles = {
   user: [''],
-  service: ['sendNotification'],
-  chairman: ['getUsers', 'manageUsers', 'loadAgenda', 'loadStaff', 'getDocuments', 'loadInfo'],
+  service: ['addUser', 'sendNotification', 'install'],
+  chairman: ['addUser', 'getUsers', 'manageUsers', 'loadAgenda', 'loadStaff', 'getDocuments', 'loadInfo'],
   member: ['getUsers', 'manageUsers', 'loadAgenda', 'loadStaff', 'getDocuments', 'loadInfo'],
 };
 

components/coopback/src/config/tokens.ts

@@ -3,4 +3,5 @@ export const tokenTypes = {
   REFRESH: 'refresh',
   RESET_PASSWORD: 'resetPassword',
   VERIFY_EMAIL: 'verifyEmail',
+  INVITE: 'invite',
 };

components/coopback/src/controllers/auth.controller.ts

@@ -26,8 +26,8 @@ export const refreshTokens = catchAsync(async (req: RRefreshTokens, res: any) =>
 });
 
 export const lostKey = catchAsync(async (req: RForgotKey, res) => {
-  const resetKeyToken = await tokenService.generateResetPasswordToken(req.body.email);
-  await emailService.sendResetPasswordEmail(req.body.email, resetKeyToken);
+  const resetKeyToken = await tokenService.generateResetKeyToken(req.body.email);
+  await emailService.sendResetKeyEmail(req.body.email, resetKeyToken);
   res.status(NO_CONTENT).send();
 });
 

components/coopback/src/controllers/coop.controller.ts

@@ -18,7 +18,7 @@ export const loadAgenda = catchAsync(async (req: Request, res: Response) => {
   const { coopname } = req.query;
   const agenda = await coopService.loadAgenda(coopname as string);
 
-  const complexAgenda: Cooperative.Documents.IComplexAgenda[] = [];
+  const complexAgenda: Cooperative.Document.IComplexAgenda[] = [];
 
   for (const { action, table } of agenda) {
     const documents = await documentService.buildComplexDocument(action);

components/coopback/src/controllers/index.ts

@@ -5,3 +5,4 @@ export * as paymentController from './payment.controller';
 export * as coopController from './coop.controller';
 export * as notifyController from './notify.controller';
 export * as monoController from './mono.controller';
+export * as participantController from './participant.controller';

components/coopback/src/controllers/mono.controller.ts

@@ -1,9 +1,16 @@
 import httpStatus from 'http-status';
 import { getMonoStatus } from '../services/mono.service';
 import { getBlockchainInfo } from '../services/blockchain.service';
-import { IHealthResponse } from '../types';
+import { IHealthResponse, IInstall, RInstall } from '../types';
 import { Request, Response } from 'express';
 import catchAsync from '../utils/catchAsync';
+import { monoService } from '../services';
+
+export const install = catchAsync(async (req: RInstall, res: Response) => {
+  const { body } = req;
+  await monoService.install(body as IInstall);
+  res.status(httpStatus.OK).send();
+});
 
 export const getHealth = catchAsync(async (req: Request, res: Response) => {
   const status = await getMonoStatus();

components/coopback/src/controllers/participant.controller.ts

@@ -0,0 +1,10 @@
+import httpStatus from 'http-status';
+import { participantService } from '../services';
+import type { RJoinCooperative } from '../types';
+import catchAsync from '../utils/catchAsync';
+
+export const joinCooperative = catchAsync(async (req: RJoinCooperative, res) => {
+  await participantService.joinCooperative(req.body);
+
+  res.status(httpStatus.OK).send();
+});

components/coopback/src/controllers/payment.controller.ts

@@ -91,7 +91,8 @@ export const addPaymentMethod = catchAsync(async (req: RSavePaymentMethod, res)
   const paymentData: Cooperative.Payments.IPaymentData = {
     username: req.body.username,
     method_id: req.body.method_id,
-    user_type: user.type,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    user_type: user.type as any,
     method_type: req.body.method_type,
     is_default: false,
     data: req.body.data,

components/coopback/src/controllers/user.controller.ts

@@ -1,12 +1,16 @@
 import http from 'http-status';
 import ApiError from '../utils/ApiError';
 import catchAsync from '../utils/catchAsync';
-import { userService, tokenService } from '../services';
-import { RCreateUser, RJoinCooperative } from '../types';
+import { userService, tokenService, emailService, blockchainService } from '../services';
+import { IAddUser, ICreateUser, RCreateUser } from '../types';
 import httpStatus from 'http-status';
 import pick from '../utils/pick';
 import { IGetResponse } from '../types/common';
-import { IUser } from '../models/user.model';
+import { IUser, userStatus } from '../models/user.model';
+import { Request, Response } from 'express';
+import { generateUsername } from '../../tests/utils/generateUsername';
+import config from '../config/config';
+import logger from '../config/logger';
 
 /**
  * Порядок регистрации:
@@ -19,9 +23,9 @@ import { IUser } from '../models/user.model';
  * 7. (joinCooperative) Пользователь подписывает заявление на вступление и вызывает метод joinCooperative, прикладывая подписанное заявление.
  * 8. Система сохраняет подписанное заявление
  * 9. (createInitialPayment) Пользователь получает ордер на оплату.
- * 9. Пользователь оплачивает ордер.
  * 10. Система принимает оплату и регистрирует аккаунт в блокчейне.
  * 11. (trx confirmpay) Пользователь подписывает велком-письмо с подтверждением собственноручности оплаты (транзакция в блокчейне для активации)
+ * 12. Регистрация продолжается ожиданием решения совета
  */
 export const createUser = catchAsync(async (req: RCreateUser, res) => {
   const user = await userService.createUser(req.body);
@@ -30,10 +34,40 @@ export const createUser = catchAsync(async (req: RCreateUser, res) => {
   res.status(http.CREATED).send({ user, tokens });
 });
 
-export const joinCooperative = catchAsync(async (req: RJoinCooperative, res) => {
-  await userService.joinCooperative(req.body);
+export const addUser = catchAsync(async (req: Request, res: Response) => {
+  const body: IAddUser = req.body;
 
-  res.status(httpStatus.OK).send();
+  const newUser: ICreateUser = {
+    ...body,
+    public_key: '',
+    role: 'user',
+    username: generateUsername(),
+  };
+
+  const user = await userService.createUser(newUser);
+  user.status = userStatus['4_Registered'];
+  user.is_registered = true;
+  await user.save();
+
+  try {
+    await blockchainService.addUser({
+      ...body,
+      ...newUser,
+      registrator: config.service_username,
+      referer: body.referer ? body.referer : '',
+      coopname: config.coopname,
+      meta: '',
+    });
+
+    const token = await tokenService.generateInviteToken(user.email);
+    await emailService.sendInviteEmail(req.body.email, token);
+  } catch (e: any) {
+    logger.warn('error on add user: ', e);
+    await userService.deleteUserByUsername(newUser.username);
+    throw new ApiError(httpStatus.BAD_GATEWAY, e.message);
+  }
+
+  res.status(httpStatus.CREATED).send({ user });
 });
 
 export const getUsers = catchAsync(async (req, res) => {
@@ -47,7 +81,7 @@ export const getUsers = catchAsync(async (req, res) => {
   for await (const user of users.results) {
     const json = user.toJSON();
     if (user.type != 'service') {
-      json.private_data = (await user.getPrivateData()) || {};
+      json.private_data = await user.getPrivateData();
       data.push(json);
     }
   }
@@ -68,7 +102,9 @@ export const getUser = catchAsync(async (req, res) => {
   }
   const json = user.toJSON();
 
-  json.private_data = await user.getPrivateData();
+  if (user.type != 'service') {
+    json.private_data = await user.getPrivateData();
+  }
 
   res.send(json);
 });
@@ -82,6 +118,6 @@ export const updateUser = catchAsync(async (req, res) => {
 });
 
 export const deleteUser = catchAsync(async (req, res) => {
-  await userService.deleteUserById(req.params.username);
+  await userService.deleteUserByUsername(req.params.username);
   res.status(http.NO_CONTENT).send();
 });

components/coopback/src/models/tempDocument.model.ts

@@ -0,0 +1,51 @@
+import mongoose, { Schema } from 'mongoose';
+import { paginate, toJSON } from './plugins';
+
+export enum tempdocType {
+  JoinStatement = 'joinStatement',
+  WalletAgreement = 'walletAgreement',
+  SignatureAgreement = 'signatureAgreement',
+  PrivacyAgreement = 'privacyAgreement',
+  UserAgreement = 'userAgreement',
+}
+
+export interface ITempDocument {
+  username: string;
+  type: tempdocType;
+  document: {
+    hash: string;
+    meta: object;
+    public_key: string;
+    signature: string;
+  };
+}
+
+const MonoSchema = new Schema<ITempDocument>({
+  username: { type: String, required: true },
+  type: { type: String, required: true, enum: ['joinStatement', 'walletAgreement'] },
+  document: {
+    public_key: {
+      type: String,
+      default: '',
+    },
+    signature: {
+      type: String,
+      default: '',
+    },
+    meta: {
+      type: Object,
+      default: {},
+    },
+    hash: {
+      type: String,
+      default: '',
+    },
+  },
+});
+
+MonoSchema.plugin(toJSON);
+MonoSchema.plugin(paginate);
+
+const TempDocument = mongoose.model<ITempDocument>('TempDocument', MonoSchema);
+
+export default TempDocument;

components/coopback/src/models/token.model.ts

@@ -25,7 +25,7 @@ const tokenSchema = new Schema<IToken>(
     },
     type: {
       type: String,
-      enum: [tokenTypes.REFRESH, tokenTypes.RESET_PASSWORD, tokenTypes.VERIFY_EMAIL],
+      enum: [tokenTypes.REFRESH, tokenTypes.RESET_PASSWORD, tokenTypes.VERIFY_EMAIL, tokenTypes.INVITE],
       required: true,
     },
     expires: {

components/coopback/src/models/user.model.ts

@@ -1,33 +1,40 @@
 import mongoose, { Schema, model, Model } from 'mongoose';
 import validator from 'validator/index';
-import bcryptjs from 'bcryptjs';
 import { toJSON, paginate } from './plugins/index';
 import { roles } from '../config/roles';
 import { generator } from '../services/document.service';
 import { Cooperative } from 'cooptypes';
 
 const { isEmail } = validator;
-const { compare, hash } = bcryptjs;
+
+export enum userStatus {
+  '1_Created' = 'created',
+  '2_Joined' = 'joined',
+  '3_Payed' = 'payed',
+  '4_Registered' = 'registered',
+  '5_Active' = 'active',
+  '10_Failed' = 'failed',
+  '200_Blocked' = 'blocked',
+}
 
 export interface IUser {
   username: string;
-  status: 'created' | 'joined' | 'payed' | 'registered' | 'active' | 'failed' | 'blocked';
+  status: userStatus;
   message: string;
   is_registered: boolean;
   has_account: boolean;
-  type: 'individual' | 'entrepreneur' | 'organization';
+  type: 'individual' | 'entrepreneur' | 'organization' | 'service';
   public_key: string;
   referer: string;
   email: string;
-  password: string;
   role: string;
   is_email_verified: boolean;
-  statement: {
-    hash: string;
-    meta: object;
-    public_key: string;
-    signature: string;
-  };
+  // statement: {
+  //   hash: string;
+  //   meta: object;
+  //   public_key: string;
+  //   signature: string;
+  // };
   private_data:
     | Cooperative.Users.IIndividualData
     | Cooperative.Users.IEntrepreneurData
@@ -36,7 +43,6 @@ export interface IUser {
   getPrivateData(): Promise<
     Cooperative.Users.IIndividualData | Cooperative.Users.IEntrepreneurData | Cooperative.Users.IOrganizationData | null
   >;
-  isPasswordMatch(password: string): Promise<boolean>;
 }
 
 interface IUserModel extends Model<IUser> {
@@ -54,8 +60,8 @@ const userSchema = new Schema<IUser, IUserModel>(
     },
     status: {
       type: String,
-      enum: ['created', 'joined', 'payed', 'registered', 'active', 'failed', 'blocked'],
-      default: 'created',
+      enum: Object.values(userStatus),
+      default: userStatus['1_Created'],
     },
     message: {
       type: String,
@@ -72,7 +78,7 @@ const userSchema = new Schema<IUser, IUserModel>(
     },
     public_key: {
       type: String,
-      required: true,
+      default: '',
     },
     referer: {
       type: String,
@@ -80,7 +86,7 @@ const userSchema = new Schema<IUser, IUserModel>(
     },
     email: {
       type: String,
-      required: true,
+      required: false,
       unique: true,
       trim: true,
       lowercase: true,
@@ -90,18 +96,6 @@ const userSchema = new Schema<IUser, IUserModel>(
         }
       },
     },
-    password: {
-      type: String,
-      required: true,
-      trim: true,
-      minlength: 8,
-      validate(value) {
-        if (!value.match(/\d/) || !value.match(/[a-zA-Z]/)) {
-          throw new Error('Password must contain at least one letter and one number');
-        }
-      },
-      private: true, // used by the toJSON plugin
-    },
     role: {
       type: String,
       enum: roles,
@@ -115,24 +109,24 @@ const userSchema = new Schema<IUser, IUserModel>(
       type: Boolean,
       default: false,
     },
-    statement: {
-      public_key: {
-        type: String,
-        default: '',
-      },
-      signature: {
-        type: String,
-        default: '',
-      },
-      meta: {
-        type: Object,
-        default: {},
-      },
-      hash: {
-        type: String,
-        default: '',
-      },
-    },
+    // statement: {
+    //   public_key: {
+    //     type: String,
+    //     default: '',
+    //   },
+    //   signature: {
+    //     type: String,
+    //     default: '',
+    //   },
+    //   meta: {
+    //     type: Object,
+    //     default: {},
+    //   },
+    //   hash: {
+    //     type: String,
+    //     default: '',
+    //   },
+    // },
   },
   {
     minimize: false,
@@ -163,21 +157,6 @@ userSchema.methods.getPrivateData = async function (): Promise<
   return result;
 };
 
-userSchema.methods.isPasswordMatch = async function (password) {
-  // eslint-disable-next-line @typescript-eslint/no-this-alias
-  const user = this;
-  return compare(password, user.password);
-};
-
-userSchema.pre('save', async function (next) {
-  // eslint-disable-next-line @typescript-eslint/no-this-alias
-  const user = this;
-  if (user.isModified('password')) {
-    user.password = await hash(user.password, 8);
-  }
-  next();
-});
-
 const User = model<IUser, IUserModel>('User', userSchema);
 
 export default User;

components/coopback/src/routes/v1/index.ts

@@ -7,6 +7,7 @@ import coopRoute from './coop.route';
 import monoRoute from './mono.route';
 import dataRoute from './document.route';
 import notifyRoute from './notify.route';
+import participantsRoute from './participant.route';
 
 import config from '../../config/config';
 
@@ -14,7 +15,7 @@ const router = Router();
 
 const defaultRoutes = [
   {
-    path: '/mono',
+    path: '/system',
     route: monoRoute,
   },
   {
@@ -25,6 +26,10 @@ const defaultRoutes = [
     path: '/users',
     route: userRoute,
   },
+  {
+    path: '/participants',
+    route: participantsRoute,
+  },
   {
     path: '/documents',
     route: dataRoute,

components/coopback/src/routes/v1/mono.route.ts

@@ -1,8 +1,12 @@
 import { Router } from 'express';
 import { monoController } from '../../controllers';
+import auth from '../../middlewares/auth';
+import validate from '../../middlewares/validate';
+import { monoValidation } from '../../validations';
 
 const router = Router();
 
+router.route('/install').post(auth('install'), validate(monoValidation.RInstall), monoController.install);
 router.route('/health').get(monoController.getHealth);
 
 export default router;

components/coopback/src/routes/v1/participant.route.ts

@@ -0,0 +1,13 @@
+import { Router } from 'express';
+import auth from '../../middlewares/auth';
+import validate from '../../middlewares/validate';
+import { participantValidation } from '../../validations';
+import { participantController } from '../../controllers';
+
+const router = Router();
+
+router
+  .route('/join-cooperative')
+  .post(auth(), validate(participantValidation.RJoinCooperative), participantController.joinCooperative);
+
+export default router;

components/coopback/src/routes/v1/user.route.ts

@@ -11,9 +11,7 @@ router
   .post(validate(userValidation.RCreateUser), userController.createUser)
   .get(auth('getUsers'), validate(userValidation.RGetUsers), userController.getUsers);
 
-router
-  .route('/join-cooperative')
-  .post(validate(userValidation.RJoinCooperative), userController.joinCooperative)
+router.route('/add').post(auth('addUser'), validate(userValidation.RAddUser), userController.addUser);
 
 router
   .route('/:username')

components/coopback/src/services/auth.service.ts

@@ -41,27 +41,13 @@ export const loginUserWithSignature = async (email, now, signature) => {
 
       if (!hasKey) throw new ApiError(httpStatus.UNAUTHORIZED, 'Неверный приватный ключ');
     } catch (e) {
-      throw new ApiError(httpStatus.BAD_REQUEST, 'Аккаунт в блокчейне не найден');
+      throw new ApiError(httpStatus.UNAUTHORIZED, 'Неверный приватный ключ');
     }
   }
 
   return user;
 };
 
-/**
- * Login with email and password
- * @param {string} email
- * @param {string} password
- * @returns {Promise<User>}
- */
-export const loginUserWithEmailAndPassword = async (email, password) => {
-  const user = await userService.getUserByEmail(email);
-  if (!user || !(await user.isPasswordMatch(password))) {
-    throw new ApiError(httpStatus.UNAUTHORIZED, 'Incorrect email or password');
-  }
-  return user;
-};
-
 /**
  * Logout
  * @param {string} refreshToken
@@ -102,26 +88,27 @@ export const refreshAuth = async (data: IRefreshTokens) => {
  */
 export const resetKey = async (resetKeyToken, publicKey) => {
   try {
-    const resetPasswordTokenDoc = await tokenService.verifyToken(resetKeyToken, tokenTypes.RESET_PASSWORD);
+    const resetKeyTokenDoc = await tokenService.verifyToken(resetKeyToken, [tokenTypes.RESET_PASSWORD, tokenTypes.INVITE]);
 
-    const user = await userService.getUserById(resetPasswordTokenDoc.user);
+    const user = await userService.getUserById(resetKeyTokenDoc.user);
     if (!user) {
       throw new Error();
     }
 
-    await blockchainService.changeKey({
-      coopname: config.coopname,
-      changer: config.service_username,
-      username: user.username,
-      public_key: publicKey,
-    });
+    if (config.env !== 'test')
+      await blockchainService.changeKey({
+        coopname: config.coopname,
+        changer: config.service_username,
+        username: user.username,
+        public_key: publicKey,
+      });
 
     await userService.updateUserById(user._id, { public_key: publicKey });
 
     await Token.deleteMany({ user: user._id, type: tokenTypes.RESET_PASSWORD });
   } catch (error) {
     console.log(error);
-    throw new ApiError(httpStatus.UNAUTHORIZED, 'Password reset failed');
+    throw new ApiError(httpStatus.UNAUTHORIZED, 'Token reset failed');
   }
 };
 

components/coopback/src/services/blockchain.service.ts

@@ -8,6 +8,9 @@ import { GatewayContract, RegistratorContract, SovietContract } from 'cooptypes'
 import { IUser } from '../models/user.model';
 import { GetAccountResult, GetInfoResult } from 'eosjs/dist/eosjs-rpc-interfaces';
 import config from '../config/config';
+import TempDocument, { tempdocType } from '../models/tempDocument.model';
+import ApiError from '../utils/ApiError';
+import httpStatus from 'http-status';
 
 const rpc = new JsonRpc(process.env.BLOCKCHAIN_RPC as string, { fetch });
 
@@ -84,9 +87,9 @@ async function getCooperative(coopname) {
 
   const [cooperative] = await lazyFetch(
     api,
-    process.env.REGISTRATOR_CONTRACT,
-    process.env.REGISTRATOR_CONTRACT,
-    'orgs',
+    RegistratorContract.contractName.production,
+    RegistratorContract.contractName.production,
+    RegistratorContract.Tables.Cooperatives.tableName,
     coopname,
     coopname,
     1
@@ -95,7 +98,7 @@ async function getCooperative(coopname) {
 }
 
 async function registerBlockchainAccount(user: IUser, orderData: GatewayContract.Actions.CompleteDeposit.ICompleteDeposit) {
-  const eos = await getInstance(process.env.REGISTRATOR_WIF);
+  const eos = await getInstance(process.env.SERVICE_WIF);
 
   const newaccount: RegistratorContract.Actions.CreateAccount.ICreateAccount = {
     registrator: process.env.COOPNAME as string,
@@ -113,11 +116,26 @@ async function registerBlockchainAccount(user: IUser, orderData: GatewayContract
     type: user.type,
   };
 
+  const statement = await TempDocument.findOne({ username: user.username, type: tempdocType.JoinStatement });
+  if (!statement) throw new ApiError(httpStatus.BAD_REQUEST, 'Не найдено заявление на вступление');
+
   const joinCooperativeData: RegistratorContract.Actions.JoinCooperative.IJoinCooperative = {
     coopname: process.env.COOPNAME as string,
     registrator: process.env.COOPNAME as string,
     username: user.username,
-    document: { ...user.statement, meta: JSON.stringify(user.statement.meta) },
+    document: { ...statement.document, meta: JSON.stringify(statement.document.meta) },
+  };
+
+  //TODO добавить здесь соглашений
+  const walletAgreement = await TempDocument.findOne({ username: user.username, type: tempdocType.WalletAgreement });
+  if (!walletAgreement) throw new ApiError(httpStatus.BAD_REQUEST, 'Не найдено заявление на вступление');
+
+  const walletAgreementData: SovietContract.Actions.Agreements.SendAgreement.ISendAgreement = {
+    coopname: process.env.COOPNAME as string,
+    administrator: process.env.COOPNAME as string,
+    username: user.username,
+    agreement_type: 'wallet',
+    document: { ...walletAgreement.document, meta: JSON.stringify(walletAgreement.document.meta) },
   };
 
   const actions = [
@@ -165,6 +183,17 @@ async function registerBlockchainAccount(user: IUser, orderData: GatewayContract
       ],
       data: orderData,
     },
+    {
+      account: SovietContract.contractName.production,
+      name: SovietContract.Actions.Agreements.SendAgreement.actionName,
+      authorization: [
+        {
+          actor: process.env.COOPNAME as string,
+          permission: 'active',
+        },
+      ],
+      data: walletAgreementData,
+    },
   ];
 
   const result = await eos.transact(
@@ -178,12 +207,42 @@ async function registerBlockchainAccount(user: IUser, orderData: GatewayContract
   );
 }
 
-async function createOrder(data) {
-  const eos = await getInstance(process.env.REGISTRATOR_WIF);
+async function createBoard(data: SovietContract.Actions.Boards.CreateBoard.ICreateboard) {
+  const eos = await getInstance(config.service_wif);
+
+  console.log('data: ', data);
 
   const actions = [
     {
-      account: process.env.GATEWAY_CONTRACT as string,
+      account: SovietContract.contractName.production,
+      name: SovietContract.Actions.Boards.CreateBoard.actionName,
+      authorization: [
+        {
+          actor: config.service_username,
+          permission: 'active',
+        },
+      ],
+      data,
+    },
+  ];
+
+  await eos.transact(
+    {
+      actions,
+    },
+    {
+      blocksBehind: 3,
+      expireSeconds: 30,
+    }
+  );
+}
+
+async function createOrder(data) {
+  const eos = await getInstance(process.env.SERVICE_WIF);
+
+  const actions = [
+    {
+      account: GatewayContract.contractName.production,
       name: 'deposit',
       authorization: [
         {
@@ -211,7 +270,7 @@ async function createOrder(data) {
 }
 
 async function completeOrder(data: GatewayContract.Actions.CompleteDeposit.ICompleteDeposit) {
-  const eos = await getInstance(process.env.REGISTRATOR_WIF);
+  const eos = await getInstance(process.env.SERVICE_WIF);
 
   const actions = [
     {
@@ -239,11 +298,11 @@ async function completeOrder(data: GatewayContract.Actions.CompleteDeposit.IComp
 }
 
 async function failOrder(data) {
-  const eos = await getInstance(process.env.REGISTRATOR_WIF);
+  const eos = await getInstance(process.env.SERVICE_WIF);
 
   const actions = [
     {
-      account: process.env.GATEWAY_CONTRACT as string,
+      account: GatewayContract.contractName.production,
       name: 'dpfail',
       authorization: [
         {
@@ -266,6 +325,34 @@ async function failOrder(data) {
   );
 }
 
+export async function addUser(data: RegistratorContract.Actions.AddUser.IAddUser) {
+  const eos = await getInstance(config.service_wif);
+
+  const actions = [
+    {
+      account: RegistratorContract.contractName.production,
+      name: RegistratorContract.Actions.AddUser.actionName,
+      authorization: [
+        {
+          actor: config.service_username,
+          permission: 'active',
+        },
+      ],
+      data,
+    },
+  ];
+
+  await eos.transact(
+    {
+      actions,
+    },
+    {
+      blocksBehind: 3,
+      expireSeconds: 30,
+    }
+  );
+}
+
 export async function changeKey(data: RegistratorContract.Actions.ChangeKey.IChangeKey) {
   const eos = await getInstance(config.service_wif);
 
@@ -297,7 +384,7 @@ export async function changeKey(data: RegistratorContract.Actions.ChangeKey.ICha
 async function getSoviet(coopname) {
   const api = await getApi();
 
-  const soviet = (await lazyFetch(api, process.env.SOVIET_CONTRACT, coopname, 'boards'))[0];
+  const soviet = (await lazyFetch(api, SovietContract.contractName.production, coopname, 'boards'))[0];
 
   return soviet;
 }
@@ -305,7 +392,7 @@ async function getSoviet(coopname) {
 async function fetchAllParticipants() {
   const api = await getApi();
 
-  const participants = await lazyFetch(api, process.env.SOVIET_CONTRACT, process.env.COOPNAME, 'participants');
+  const participants = await lazyFetch(api, SovietContract.contractName.production, process.env.COOPNAME, 'participants');
   return participants;
 }
 
@@ -323,4 +410,5 @@ export {
   getBlockchainInfo,
   getBlockchainAccount,
   hasActiveKey,
+  createBoard,
 };

components/coopback/src/services/coop.service.ts

@@ -6,23 +6,23 @@ import ApiError from '../utils/ApiError';
 import httpStatus from 'http-status';
 import logger from '../config/logger';
 
-export const loadAgenda = async (coopname: string): Promise<Cooperative.Documents.IAgenda[]> => {
+export const loadAgenda = async (coopname: string): Promise<Cooperative.Document.IAgenda[]> => {
   const api = await blockchainService.getApi();
 
   const decisions = (await blockchainService.lazyFetch(
     api,
-    process.env.SOVIET_CONTRACT as string,
+    SovietContract.contractName.production as string,
     coopname,
     'decisions'
   )) as SovietContract.Tables.Decisions.IDecision[];
 
-  const agenda = [] as Cooperative.Documents.IAgenda[];
+  const agenda = [] as Cooperative.Document.IAgenda[];
 
   for (const table of decisions) {
     const action = (
       await getActions(`${process.env.SIMPLE_EXPLORER_API}/get-actions`, {
         filter: JSON.stringify({
-          account: process.env.SOVIET_CONTRACT,
+          account: SovietContract.contractName.production,
           name: SovietContract.Actions.Registry.NewSubmitted.actionName,
           receiver: process.env.COOPNAME,
           'data.decision_id': String(table.id),
@@ -40,7 +40,7 @@ export const loadAgenda = async (coopname: string): Promise<Cooperative.Document
 export const loadStaff = async (coopname) => {
   const api = await blockchainService.getApi();
 
-  const staff = await blockchainService.lazyFetch(api, process.env.SOVIET_CONTRACT, coopname, 'staff');
+  const staff = await blockchainService.lazyFetch(api, SovietContract.contractName.production, coopname, 'staff');
 
   for (const staf of staff) {
     const user = await userService.getUserByUsername(staf.username);

components/coopback/src/services/document.service.ts

@@ -12,25 +12,36 @@ export const connectGenerator = async () => {
 };
 
 export const generateDocument = async (options: IGenerate) => {
+  console.log('controller generate: ', options);
   return await generator.generate(options);
 };
 
 // Шаг 1: Создание новой функции для сборки complexDocument
 export async function buildComplexDocument(
   raw_action_document: Cooperative.Blockchain.IAction
-): Promise<Cooperative.Documents.IComplexDocument> {
-  let statement = {} as Cooperative.Documents.IComplexStatement;
-  let decision = {} as Cooperative.Documents.IComplexDecision;
-  let act = {} as Cooperative.Documents.IComplexAct;
+): Promise<Cooperative.Document.IComplexDocument> {
+  let statement = {} as Cooperative.Document.IComplexStatement;
+  let decision = {} as Cooperative.Document.IComplexDecision;
+  const act = {} as Cooperative.Document.IComplexAct;
+  const links: Cooperative.Document.IGeneratedDocument[] = [];
 
   const raw_document = raw_action_document.data as SovietContract.Actions.Registry.NewSubmitted.INewSubmitted;
 
   // Готовим заявления
   {
     const document = await generator.getDocument({ hash: raw_document.document.hash });
+    console.log('document: ', document);
+
+    if (document)
+      for (const link of document.meta.links) {
+        console.log('look for link: ', link);
+        const linked_document = await generator.getDocument({ hash: link });
+        links.push(linked_document);
+      }
+
     const user = await User.findOne({ username: raw_document.username });
 
-    if (user) {
+    if (user && user.type != 'service') {
       const user_data = await user?.getPrivateData();
 
       const action: Cooperative.Blockchain.IExtendedAction = {
@@ -39,8 +50,6 @@ export async function buildComplexDocument(
       };
 
       statement = { action, document };
-    } else {
-      // throw new ApiError(400, 'Ошибка, один из пользователей не найден. Обратитесь в поддержку.');
     }
   }
 
@@ -51,7 +60,7 @@ export async function buildComplexDocument(
     const decision_action = (
       await getActions(`${process.env.SIMPLE_EXPLORER_API}/get-actions`, {
         filter: JSON.stringify({
-          account: process.env.SOVIET_CONTRACT,
+          account: SovietContract.contractName.production,
           name: SovietContract.Actions.Registry.NewDecision.actionName,
           receiver: process.env.COOPNAME,
           'data.decision_id': String(raw_document.decision_id),
@@ -65,8 +74,6 @@ export async function buildComplexDocument(
       const user = await User.findOne({ username: decision_action?.data?.username });
 
       if (user) {
-        const user_data = user.getPrivateData();
-
         decision_extended_action = {
           ...decision_action,
           user: (await user?.getPrivateData()) || null,
@@ -74,6 +81,12 @@ export async function buildComplexDocument(
 
         const document = await generator.getDocument({ hash: decision_action?.data?.document?.hash });
 
+        if (document)
+          for (const link of document.meta.links) {
+            const linked_document = await generator.getDocument({ hash: link });
+            links.push(linked_document);
+          }
+
         decision = {
           document,
           action: decision_extended_action,
@@ -87,21 +100,21 @@ export async function buildComplexDocument(
   }
 
   // Готовим акты
-  const acts: Cooperative.Documents.IComplexAct[] = [];
+  const acts: Cooperative.Document.IComplexAct[] = [];
 
-  return { statement, decision, acts };
+  return { statement, decision, acts, links };
 }
 
 export const queryDocuments = async (
   filter: any,
   page = 1,
   limit = 100
-): Promise<Cooperative.Documents.IGetComplexDocuments> => {
+): Promise<Cooperative.Document.IGetComplexDocuments> => {
   const actions = await getActions<SovietContract.Actions.Registry.NewResolved.INewResolved>(
     `${process.env.SIMPLE_EXPLORER_API}/get-actions`,
     {
       filter: JSON.stringify({
-        account: process.env.SOVIET_CONTRACT,
+        account: SovietContract.contractName.production,
         name: SovietContract.Actions.Registry.NewResolved.actionName,
         receiver: process.env.COOPNAME,
         ...filter,
@@ -111,7 +124,7 @@ export const queryDocuments = async (
     }
   );
 
-  const response: Cooperative.Documents.IGetComplexDocuments = {
+  const response: Cooperative.Document.IGetComplexDocuments = {
     results: [],
     page,
     limit,
@@ -122,6 +135,6 @@ export const queryDocuments = async (
 
     if (complexDocument.decision.action) response.results.push(complexDocument);
   }
-
+  console.log(response);
   return response;
 };

components/coopback/src/services/email.service.ts

@@ -4,7 +4,7 @@ import logger from '../config/logger';
 
 const { email, env } = config;
 
-const transport = createTransport(email.smtp);
+export const transport = createTransport(email.smtp);
 
 /* istanbul ignore next */
 if (env !== 'test') {
@@ -21,7 +21,7 @@ if (env !== 'test') {
  * @param {string} text
  * @returns {Promise}
  */
-const sendEmail = async (to, subject, text) => {
+export const sendEmail = async (to, subject, text) => {
   const msg = { from: email.from, to, subject, text };
   await transport.sendMail(msg);
 };
@@ -32,7 +32,7 @@ const sendEmail = async (to, subject, text) => {
  * @param {string} token
  * @returns {Promise}
  */
-const sendResetPasswordEmail = async (to, token) => {
+export const sendResetKeyEmail = async (to, token) => {
   const subject = 'Восстановление доступа';
 
   const resetPasswordUrl = `${config.base_url}/#/${config.coopname}/auth/reset-key?token=${token}`;
@@ -44,13 +44,31 @@ const sendResetPasswordEmail = async (to, token) => {
   await sendEmail(to, subject, text);
 };
 
+/**
+ * Send reset password email
+ * @param {string} to
+ * @param {string} token
+ * @returns {Promise}
+ */
+export const sendInviteEmail = async (to, token) => {
+  const subject = 'Приглашение в Цифровой Кооператив';
+
+  const inviteUrl = `${config.base_url}/#/${config.coopname}/auth/reset-key?token=${token}`;
+  const text = `Вам отправлено приглашение на подключение к Цифровому Кооперативу в качестве действующего пайщика.
+Для того, чтобы воспользоваться приглашением и получить ключ доступа, пожалуйста, нажмите на ссылку: ${inviteUrl}
+
+Время действия ссылки - 24 часа.`;
+
+  await sendEmail(to, subject, text);
+};
+
 /**
  * Send verification email
  * @param {string} to
  * @param {string} token
  * @returns {Promise}
  */
-const sendVerificationEmail = async (to, token) => {
+export const sendVerificationEmail = async (to, token) => {
   const subject = 'Email Verification';
   // replace this url with the link to the email verification page of your front-end app
   const verificationEmailUrl = `http://link-to-app/verify-email?token=${token}`;
@@ -59,5 +77,3 @@ To verify your email, click on this link: ${verificationEmailUrl}
 If you did not create an account, then ignore this email.`;
   await sendEmail(to, subject, text);
 };
-
-export { transport, sendEmail, sendResetPasswordEmail, sendVerificationEmail };

components/coopback/src/services/index.ts

@@ -8,3 +8,4 @@ export * as documentService from './document.service';
 export * as coopService from './coop.service';
 export * as wsService from './ws.service';
 export * as monoService from './mono.service';
+export * as participantService from './participant.service';

components/coopback/src/services/mono.service.ts

@@ -3,7 +3,112 @@ import { Mono } from '../models';
 import ApiError from '../utils/ApiError';
 import config from '../config/config';
 import logger from '../config/logger';
-import { IHealthStatus } from '../types';
+import { IAddUser, ICreateUser, IHealthStatus, IInstall } from '../types';
+import { generateUsername } from '../../tests/utils/generateUsername';
+import { generator } from './document.service';
+import { blockchainService, emailService, tokenService, userService } from '.';
+import { IUser, userStatus } from '../models/user.model';
+import axios from 'axios';
+import { getBlockchainInfo } from './blockchain.service';
+import { RegistratorContract } from 'cooptypes';
+
+export const install = async (soviet: IInstall): Promise<void> => {
+  console.log('IInstall: ', soviet);
+
+  const mono = await Mono.findOne({ coopname: config.coopname });
+  const info = await getBlockchainInfo();
+  const coop = await blockchainService.getCooperative(config.coopname);
+
+  if (!coop) throw new ApiError(httpStatus.BAD_REQUEST, 'Информация о кооперативе не обнаружена');
+
+  if (mono && mono.status != 'install') {
+    throw new ApiError(httpStatus.BAD_REQUEST, 'Установка уже выполнена');
+  }
+
+  const users = [] as IUser[];
+  const members = [] as any;
+  const sovietExt = [] as any;
+
+  try {
+    for (const member of soviet) {
+      console.log(member);
+
+      const username = generateUsername();
+      sovietExt.push({ ...member, username });
+
+      const addUser: RegistratorContract.Actions.AddUser.IAddUser = {
+        registrator: config.service_username,
+        coopname: config.coopname,
+        referer: '',
+        username,
+        type: 'individual',
+        created_at: info.head_block_time,
+        initial: coop.initial,
+        minimum: coop.minimum,
+        spread_initial: false,
+        meta: '',
+      };
+
+      await blockchainService.addUser(addUser);
+
+      const createUser: ICreateUser = {
+        email: member.individual_data.email,
+        individual_data: member.individual_data,
+        referer: '',
+        role: 'user',
+        type: 'individual',
+        username,
+      };
+
+      const user = await userService.createUser(createUser);
+      user.status = userStatus['4_Registered'];
+      user.is_registered = true;
+      await user.save();
+
+      //Генерируем токен и отправляем приглашение
+      const token = await tokenService.generateInviteToken(member.individual_data.email);
+      await emailService.sendInviteEmail(member.individual_data.email, token);
+
+      //Добавляем в массив членов для отправки в бч
+      members.push({
+        username: username,
+        is_voting: true,
+        position_title: member.role === 'chairman' ? 'Председатель совета' : 'Член совета',
+        position: member.role,
+      });
+
+      users.push(user);
+    }
+
+    const chairman = sovietExt.find((el) => el.role == 'chairman');
+
+    //TODO создаёт доску совета
+    await blockchainService.createBoard({
+      coopname: config.coopname,
+      username: config.service_username,
+      type: 'soviet',
+      members: members,
+      name: 'Совет',
+      description: '',
+    });
+  } catch (e: any) {
+    console.log('on error', e);
+    for (const user of users) {
+      await userService.deleteUserByUsername(user.username);
+      await generator.del('individual', { username: user.username });
+    }
+    throw new ApiError(httpStatus.BAD_REQUEST, e.message);
+  }
+
+  await Mono.updateOne(
+    { coopname: config.coopname },
+    {
+      status: 'active',
+    }
+  );
+
+  logger.info('MONO активирован');
+};
 
 export const init = async (): Promise<void> => {
   const mono = await Mono.findOne({ coopname: config.coopname });

components/coopback/src/services/participant.service.ts

@@ -0,0 +1,82 @@
+import { PublicKey, Signature } from '@wharfkit/antelope';
+import type { IDocument, IJoinCooperative } from '../types';
+import ApiError from '../utils/ApiError';
+import { getUserByUsername } from './user.service';
+import http from 'http-status';
+import TempDocument, { tempdocType } from '../models/tempDocument.model';
+import mongoose from 'mongoose';
+import { userStatus, type IUser } from '../models/user.model';
+
+const verifyDocumentSignature = (user: IUser, document: IDocument): void => {
+  const { hash, public_key, signature } = document;
+  const publicKeyObj = PublicKey.from(public_key);
+  const signatureObj = Signature.from(signature);
+
+  const verified: boolean = signatureObj.verifyDigest(hash, publicKeyObj);
+  if (!verified) {
+    throw new ApiError(http.INTERNAL_SERVER_ERROR, 'Invalid signature');
+  }
+
+  if (user.public_key !== document.public_key) throw new ApiError(http.BAD_REQUEST, 'Public keys are mismatched');
+};
+
+/**
+ * Join a Cooperative
+ *
+ */
+export const joinCooperative = async (data: IJoinCooperative): Promise<void> => {
+  const user = await getUserByUsername(data.username);
+
+  if (!user) {
+    throw new ApiError(http.NOT_FOUND, 'Пользователь не найден');
+  }
+
+  if (user.status !== userStatus['1_Created'] && user.status !== userStatus['2_Joined']) {
+    throw new ApiError(http.NOT_FOUND, 'Пользователь уже вступил в кооператив');
+  }
+
+  verifyDocumentSignature(user, data.statement);
+  verifyDocumentSignature(user, data.wallet_agreement);
+  verifyDocumentSignature(user, data.user_agreement);
+  verifyDocumentSignature(user, data.privacy_agreement);
+  verifyDocumentSignature(user, data.signature_agreement);
+
+  const session = await mongoose.startSession();
+
+  await session.withTransaction(async () => {
+    await TempDocument.findOneAndUpdate(
+      { username: user.username, type: tempdocType.JoinStatement },
+      { $set: { document: data.statement } },
+      { upsert: true, new: true, session }
+    );
+
+    await TempDocument.findOneAndUpdate(
+      { username: user.username, type: tempdocType.WalletAgreement },
+      { $set: { document: data.wallet_agreement } },
+      { upsert: true, new: true, session }
+    );
+
+    await TempDocument.findOneAndUpdate(
+      { username: user.username, type: tempdocType.PrivacyAgreement },
+      { $set: { document: data.privacy_agreement } },
+      { upsert: true, new: true, session }
+    );
+
+    await TempDocument.findOneAndUpdate(
+      { username: user.username, type: tempdocType.SignatureAgreement },
+      { $set: { document: data.signature_agreement } },
+      { upsert: true, new: true, session }
+    );
+
+    await TempDocument.findOneAndUpdate(
+      { username: user.username, type: tempdocType.UserAgreement },
+      { $set: { document: data.user_agreement } },
+      { upsert: true, new: true, session }
+    );
+
+    user.status = userStatus['2_Joined'];
+    await user.save({ session });
+  });
+
+  session.endSession();
+};

components/coopback/src/services/payment.service.ts

@@ -12,6 +12,7 @@ import httpStatus from 'http-status';
 import { ICreatedPayment, IYandexIPN, PaymentDetails } from '../types/common';
 import { Cooperative } from 'cooptypes';
 import { FilterQuery } from 'mongoose';
+import { userStatus } from '../models/user.model';
 
 const { connection } = mongoose;
 
@@ -198,7 +199,10 @@ export async function createInitialOrder(username: string, data: ICreateInitialP
 }
 
 export async function catchIPN(ipnBody: IYandexIPN) {
+  if (!connection.db) throw new Error('Нет подключения');
+
   const payments = await connection.db.collection('payments');
+
   const exist = await payments.findOne({ 'object.id': ipnBody.object.id });
 
   if (!exist) {
@@ -238,7 +242,7 @@ export async function catchIPN(ipnBody: IYandexIPN) {
             });
 
             logger.info('Зарегистрирован новый пользователь: ', user.username);
-            user.status = 'registered';
+            user.status = userStatus['4_Registered'];
             user.is_registered = true;
           } else if (order.type === 'deposit') {
             await blockchainService.completeOrder({
@@ -268,7 +272,7 @@ export async function catchIPN(ipnBody: IYandexIPN) {
             memo: '',
           });
 
-          user.status = 'failed';
+          user.status = userStatus['10_Failed'];
           user.message = e.message;
           await user.save();
         }

components/coopback/src/services/token.service.ts

@@ -48,12 +48,17 @@ export const saveToken = async (token, userId, expires, type, blacklisted = fals
 /**
  * Verify token and return token doc (or throw an error if it is not valid)
  * @param {string} token
- * @param {string} type
+ * @param {string[]} types
  * @returns {Promise<Token>}
  */
-export const verifyToken = async (token, type) => {
+export const verifyToken = async (token, types) => {
   const payload = jwt.verify(token, config.jwt.secret);
-  const tokenDoc = await Token.findOne({ token, type, user: payload.sub, blacklisted: false });
+  const tokenDoc = await Token.findOne({
+    token,
+    $or: types.map((type) => ({ type })),
+    user: payload.sub,
+    blacklisted: false,
+  });
   if (!tokenDoc) {
     throw new Error('Token not found');
   }
@@ -68,7 +73,7 @@ export const verifyToken = async (token, type) => {
 export const generateServiceAccessToken = async (user) => {
   const accessTokenExpires = moment().add(100, 'years'); // Пример с очень долгим сроком действия
   const accessToken = generateToken(user.id, accessTokenExpires, tokenTypes.ACCESS);
-
+  console.log('on generate', accessToken);
   return {
     access: {
       token: accessToken,
@@ -107,7 +112,7 @@ export const generateAuthTokens = async (user) => {
  * @param {string} email
  * @returns {Promise<string>}
  */
-export const generateResetPasswordToken = async (email) => {
+export const generateResetKeyToken = async (email) => {
   const user = await userService.getUserByEmail(email);
   if (!user) {
     throw new ApiError(httpStatus.NOT_FOUND, 'No users found with this email');
@@ -118,6 +123,22 @@ export const generateResetPasswordToken = async (email) => {
   return resetKeyToken;
 };
 
+/**
+ * Generate invite token
+ * @param {string} email
+ * @returns {Promise<string>}
+ */
+export const generateInviteToken = async (email) => {
+  const user = await userService.getUserByEmail(email);
+  if (!user) {
+    throw new ApiError(httpStatus.NOT_FOUND, 'No users found with this email');
+  }
+  const expires = moment().add(config.jwt.inviteExpirationMinutes, 'minutes');
+  const inviteToken = generateToken(user.id, expires, tokenTypes.INVITE);
+  await saveToken(inviteToken, user.id, expires, tokenTypes.INVITE);
+  return inviteToken;
+};
+
 /**
  * Generate verify email token
  * @param {User} user

components/coopback/src/services/user.service.ts

@@ -2,21 +2,15 @@ import http from 'http-status';
 import { User } from '../models';
 import ApiError from '../utils/ApiError';
 import { generator } from './document.service';
-import { ICreateUser, IJoinCooperative } from '../types/auto-generated/user.validation';
-import ecc from 'eosjs-ecc';
+import { ICreateUser } from '../types/auto-generated/user.validation';
 import { PublicKey, Signature } from '@wharfkit/antelope';
 import faker from 'faker';
-import { randomBytes } from 'crypto';
 
 export const createServiceUser = async (username: string) => {
-  const password = randomBytes(16).toString('hex');
   return User.create({
     username,
     type: 'service',
     role: 'service',
-    public_key: 'thanks-no-need',
-    password,
-    email: faker.internet.email().toLowerCase(),
   });
 };
 
@@ -28,6 +22,7 @@ export const createServiceUser = async (username: string) => {
 export const createUser = async (userBody: ICreateUser) => {
   //TODO проверяем на существование пользователя
   //допускаем обновление личных данных, если пользователь находится в статусе 'created'
+
   const exist = await User.findOne({ email: userBody.email });
 
   if (userBody.type === 'individual' && !userBody.individual_data)
@@ -62,35 +57,6 @@ export const createUser = async (userBody: ICreateUser) => {
   }
 };
 
-/**
- * Join a Cooperative
- *
- */
-export const joinCooperative = async (data: IJoinCooperative): Promise<void> => {
-  const user = await getUserByUsername(data.username);
-
-  if (!user) {
-    throw new ApiError(http.NOT_FOUND, 'Пользователь не найден');
-  }
-
-  user.statement = data.statement;
-  user.status = 'joined';
-
-  const hash = data.statement.hash;
-  const public_key = PublicKey.from(data.statement.public_key);
-  const signature = Signature.from(data.statement.signature);
-
-  const verified: boolean = signature.verifyDigest(hash, public_key);
-
-  if (!verified) {
-    throw new ApiError(http.INTERNAL_SERVER_ERROR, 'Invalid signature');
-  }
-
-  if (user.public_key !== data.statement.public_key) throw new ApiError(http.BAD_REQUEST, 'Public keys are mismatched');
-
-  await user.save();
-};
-
 /**
  * Query for users
  * @param {Object} filter - Mongo filter
@@ -186,7 +152,7 @@ export const updateUserByUsername = async (username, updateBody) => {
  * @param {string} username
  * @returns {Promise<User>}
  */
-export const deleteUserById = async (username) => {
+export const deleteUserByUsername = async (username) => {
   const user = await getUserByUsername(username);
   if (!user) {
     throw new ApiError(http.NOT_FOUND, 'Пользователь не найден');

components/coopback/src/services/ws.service.ts

@@ -16,7 +16,9 @@ export const updateBoard = async (action: SovietContract.Actions.Boards.UpdateBo
     await user.save();
   }
 
-  const chairman = await userService.getUserByUsername(action.chairman);
+  const chairman_username = action.members.find((el) => el.position == 'chairman')?.username;
+
+  const chairman = await userService.getUserByUsername(chairman_username as string);
   chairman.role = 'chairman';
   await chairman.save();
 };

components/coopback/src/types/auto-generated/document.validation.ts

@@ -8,13 +8,13 @@ export interface IGenerate {
    * Unknown Property
    */
   [x: string]: unknown;
-  action: string;
   block_num?: number;
-  code: string;
   coopname: string;
   created_at?: string;
   generator?: string;
   lang?: 'ru';
+  links?: string[];
+  registry_id: number;
   timezone?: string;
   username: string;
   version?: string;
@@ -39,13 +39,13 @@ export interface RGenerate {
      * Unknown Property
      */
     [x: string]: unknown;
-    action: string;
     block_num?: number;
-    code: string;
     coopname: string;
     created_at?: string;
     generator?: string;
     lang?: 'ru';
+    links?: string[];
+    registry_id: number;
     timezone?: string;
     username: string;
     version?: string;

components/coopback/src/types/auto-generated/index.ts

@@ -6,6 +6,8 @@
 export * from './auth.validation';
 export * from './coop.validation';
 export * from './document.validation';
+export * from './mono.validation';
 export * from './notify.validation';
+export * from './participant.validation';
 export * from './payment.validation';
 export * from './user.validation';

components/coopback/src/types/auto-generated/mono.validation.ts

@@ -0,0 +1,32 @@
+/**
+ * This file was automatically generated by joi-to-typescript
+ * Do not modify this file manually
+ */
+
+export type IInstall = ({
+  individual_data: {
+    birthdate: string;
+    email: string;
+    first_name: string;
+    full_address: string;
+    last_name: string;
+    middle_name: string;
+    phone: string;
+  };
+  role: 'chairman' | 'member';
+})[];
+
+export interface RInstall {
+  body: ({
+    individual_data: {
+      birthdate: string;
+      email: string;
+      first_name: string;
+      full_address: string;
+      last_name: string;
+      middle_name: string;
+      phone: string;
+    };
+    role: 'chairman' | 'member';
+  })[];
+}

components/coopback/src/types/auto-generated/participant.validation.ts

@@ -0,0 +1,81 @@
+/**
+ * This file was automatically generated by joi-to-typescript
+ * Do not modify this file manually
+ */
+
+export interface IDocument {
+  hash: string;
+  meta: object;
+  public_key: string;
+  signature: string;
+}
+
+export interface IJoinCooperative {
+  privacy_agreement: {
+    hash: string;
+    meta: object;
+    public_key: string;
+    signature: string;
+  };
+  signature_agreement: {
+    hash: string;
+    meta: object;
+    public_key: string;
+    signature: string;
+  };
+  statement: {
+    hash: string;
+    meta: object;
+    public_key: string;
+    signature: string;
+  };
+  user_agreement: {
+    hash: string;
+    meta: object;
+    public_key: string;
+    signature: string;
+  };
+  username: string;
+  wallet_agreement: {
+    hash: string;
+    meta: object;
+    public_key: string;
+    signature: string;
+  };
+}
+
+export interface RJoinCooperative {
+  body: {
+    privacy_agreement: {
+      hash: string;
+      meta: object;
+      public_key: string;
+      signature: string;
+    };
+    signature_agreement: {
+      hash: string;
+      meta: object;
+      public_key: string;
+      signature: string;
+    };
+    statement: {
+      hash: string;
+      meta: object;
+      public_key: string;
+      signature: string;
+    };
+    user_agreement: {
+      hash: string;
+      meta: object;
+      public_key: string;
+      signature: string;
+    };
+    username: string;
+    wallet_agreement: {
+      hash: string;
+      meta: object;
+      public_key: string;
+      signature: string;
+    };
+  };
+}

components/coopback/src/types/auto-generated/user.validation.ts

@@ -3,6 +3,84 @@
  * Do not modify this file manually
  */
 
+export interface IAddUser {
+  created_at: string;
+  email: string;
+  entrepreneur_data?: {
+    bank_account: {
+      account_number: string;
+      bank_name: string;
+      card_number?: string;
+      currency: 'RUB' | 'Other';
+      details: {
+        bik: string;
+        corr: string;
+        kpp: string;
+      };
+    };
+    birthdate: string;
+    city: string;
+    country: 'Russia' | 'Other';
+    details: {
+      inn: string;
+      ogrn: string;
+    };
+    email: string;
+    first_name: string;
+    full_address: string;
+    last_name: string;
+    middle_name: string;
+    phone: string;
+  };
+  individual_data?: {
+    birthdate: string;
+    email: string;
+    first_name: string;
+    full_address: string;
+    last_name: string;
+    middle_name: string;
+    phone: string;
+  };
+  initial: string;
+  minimum: string;
+  organization_data?: {
+    bank_account: {
+      account_number: string;
+      bank_name: string;
+      card_number?: string;
+      currency: 'RUB' | 'Other';
+      details: {
+        bik: string;
+        corr: string;
+        kpp: string;
+      };
+    };
+    city: string;
+    country: 'Russia' | 'Other';
+    details: {
+      inn: string;
+      ogrn: string;
+    };
+    email: string;
+    full_address: string;
+    full_name: string;
+    is_cooperative: boolean;
+    phone: string;
+    represented_by: {
+      based_on: string;
+      first_name: string;
+      last_name: string;
+      middle_name: string;
+      position: string;
+    };
+    short_name: string;
+    type: 'coop' | 'ooo' | 'oao' | 'zao' | 'pao' | 'ao';
+  };
+  referer?: string;
+  spread_initial: boolean;
+  type: 'individual' | 'entrepreneur' | 'organization';
+}
+
 export interface ICreateUser {
   email: string;
   entrepreneur_data?: {
@@ -73,21 +151,13 @@ export interface ICreateUser {
     short_name: string;
     type: 'coop' | 'ooo' | 'oao' | 'zao' | 'pao' | 'ao';
   };
-  password: string;
-  public_key: string;
+  public_key?: string;
   referer?: string;
-  role: 'user' | 'chairman' | 'member';
+  role: 'user';
   type: 'individual' | 'entrepreneur' | 'organization';
   username: string;
 }
 
-export interface IDocument {
-  hash: string;
-  meta: object;
-  public_key: string;
-  signature: string;
-}
-
 export interface IEntrepreneurData {
   bank_account: {
     account_number: string;
@@ -125,16 +195,6 @@ export interface IIndividualData {
   phone: string;
 }
 
-export interface IJoinCooperative {
-  statement: {
-    hash: string;
-    meta: object;
-    public_key: string;
-    signature: string;
-  };
-  username: string;
-}
-
 export interface IOrganizationData {
   bank_account: {
     account_number: string;
@@ -169,6 +229,86 @@ export interface IOrganizationData {
   type: 'coop' | 'ooo' | 'oao' | 'zao' | 'pao' | 'ao';
 }
 
+export interface RAddUser {
+  body: {
+    created_at: string;
+    email: string;
+    entrepreneur_data?: {
+      bank_account: {
+        account_number: string;
+        bank_name: string;
+        card_number?: string;
+        currency: 'RUB' | 'Other';
+        details: {
+          bik: string;
+          corr: string;
+          kpp: string;
+        };
+      };
+      birthdate: string;
+      city: string;
+      country: 'Russia' | 'Other';
+      details: {
+        inn: string;
+        ogrn: string;
+      };
+      email: string;
+      first_name: string;
+      full_address: string;
+      last_name: string;
+      middle_name: string;
+      phone: string;
+    };
+    individual_data?: {
+      birthdate: string;
+      email: string;
+      first_name: string;
+      full_address: string;
+      last_name: string;
+      middle_name: string;
+      phone: string;
+    };
+    initial: string;
+    minimum: string;
+    organization_data?: {
+      bank_account: {
+        account_number: string;
+        bank_name: string;
+        card_number?: string;
+        currency: 'RUB' | 'Other';
+        details: {
+          bik: string;
+          corr: string;
+          kpp: string;
+        };
+      };
+      city: string;
+      country: 'Russia' | 'Other';
+      details: {
+        inn: string;
+        ogrn: string;
+      };
+      email: string;
+      full_address: string;
+      full_name: string;
+      is_cooperative: boolean;
+      phone: string;
+      represented_by: {
+        based_on: string;
+        first_name: string;
+        last_name: string;
+        middle_name: string;
+        position: string;
+      };
+      short_name: string;
+      type: 'coop' | 'ooo' | 'oao' | 'zao' | 'pao' | 'ao';
+    };
+    referer?: string;
+    spread_initial: boolean;
+    type: 'individual' | 'entrepreneur' | 'organization';
+  };
+}
+
 export interface RCreateUser {
   body: {
     email: string;
@@ -240,10 +380,9 @@ export interface RCreateUser {
       short_name: string;
       type: 'coop' | 'ooo' | 'oao' | 'zao' | 'pao' | 'ao';
     };
-    password: string;
-    public_key: string;
+    public_key?: string;
     referer?: string;
-    role: 'user' | 'chairman' | 'member';
+    role: 'user';
     type: 'individual' | 'entrepreneur' | 'organization';
     username: string;
   };
@@ -265,22 +404,9 @@ export interface RGetUsers {
   };
 }
 
-export interface RJoinCooperative {
-  body: {
-    statement: {
-      hash: string;
-      meta: object;
-      public_key: string;
-      signature: string;
-    };
-    username: string;
-  };
-}
-
 export interface RUpdateUser {
   body?: {
     email?: string;
-    password?: string;
   };
   params?: {
     username: string;

components/coopback/src/types/common.ts

@@ -59,7 +59,7 @@ export interface ICreatedPayment {
   details: PaymentDetails;
 }
 
-export type IGetResponse<T> = Cooperative.Documents.IGetResponse<T>;
+export type IGetResponse<T> = Cooperative.Document.IGetResponse<T>;
 
 export interface IGetActions<T> {
   results: IAction[];

components/coopback/src/validations/document.validation.ts

@@ -1,8 +1,7 @@
 import * as Joi from 'joi';
 
 export const IGenerate = Joi.object({
-  code: Joi.string().required(),
-  action: Joi.string().required(),
+  registry_id: Joi.number().required(),
   coopname: Joi.string().required(),
   username: Joi.string().required(),
   generator: Joi.string().optional(),
@@ -11,6 +10,7 @@ export const IGenerate = Joi.object({
   created_at: Joi.string().optional(),
   block_num: Joi.number().optional(),
   timezone: Joi.string().optional(),
+  links: Joi.array().items(Joi.string()).default([]),
 }).unknown(true);
 
 export const RGenerate = Joi.object({

components/coopback/src/validations/index.ts

@@ -5,3 +5,5 @@ export * as orderValidation from './payment.validation';
 export * as coopValidation from './coop.validation';
 export * as customValidation from './custom.validation';
 export * as notifyValidation from './notify.validation';
+export * as monoValidation from './mono.validation';
+export * as participantValidation from './participant.validation';

components/coopback/src/validations/mono.validation.ts

@@ -0,0 +1,13 @@
+import * as Joi from 'joi';
+import { IIndividualData } from './user.validation';
+
+export const IInstall = Joi.array().items(
+  Joi.object({
+    role: Joi.string().required().valid('chairman', 'member'),
+    individual_data: IIndividualData.required(),
+  })
+);
+
+export const RInstall = Joi.object({
+  body: IInstall.required(),
+});

components/coopback/src/validations/participant.validation.ts

@@ -0,0 +1,21 @@
+import * as Joi from 'joi';
+
+export const IDocument = Joi.object().keys({
+  hash: Joi.string().required(),
+  signature: Joi.string().required(),
+  public_key: Joi.string().required(),
+  meta: Joi.object().required(),
+});
+
+export const IJoinCooperative = Joi.object({
+  username: Joi.string().required(),
+  statement: IDocument.required(),
+  wallet_agreement: IDocument.required(),
+  signature_agreement: IDocument.required(),
+  privacy_agreement: IDocument.required(),
+  user_agreement: IDocument.required(),
+});
+
+export const RJoinCooperative = Joi.object({
+  body: IJoinCooperative.required(),
+});

components/coopback/src/validations/user.validation.ts

@@ -1,5 +1,5 @@
 import * as Joi from 'joi';
-import { password, objectId } from './custom.validation';
+import { password } from './custom.validation';
 import { IBankAccount } from './payment.validation';
 
 export const IIndividualData = Joi.object({
@@ -57,9 +57,8 @@ export const IEntrepreneurData = Joi.object({
 
 export const ICreateUser = Joi.object({
   email: Joi.string().required().email(),
-  password: Joi.string().required().custom(password),
-  role: Joi.string().required().valid('user', 'chairman', 'member'),
-  public_key: Joi.string().required(),
+  role: Joi.string().required().valid('user'),
+  public_key: Joi.string().optional(),
   username: Joi.string().required().length(12),
   referer: Joi.string().length(12).allow('').optional(),
   type: Joi.string().required().valid('individual', 'entrepreneur', 'organization'),
@@ -68,11 +67,23 @@ export const ICreateUser = Joi.object({
   entrepreneur_data: IEntrepreneurData.optional(),
 });
 
-export const IDocument = Joi.object().keys({
-  hash: Joi.string().required(),
-  signature: Joi.string().required(),
-  public_key: Joi.string().required(),
-  meta: Joi.object().required(),
+export const IAddUser = Joi.object({
+  email: Joi.string().required().email(),
+  referer: Joi.string().length(12).allow('').optional(),
+  type: Joi.string().required().valid('individual', 'entrepreneur', 'organization'),
+  individual_data: IIndividualData.optional(),
+  organization_data: IOrganizationData.optional(),
+  entrepreneur_data: IEntrepreneurData.optional(),
+
+  spread_initial: Joi.boolean().required(),
+
+  created_at: Joi.string().required(),
+  initial: Joi.string().required(),
+  minimum: Joi.string().required(),
+});
+
+export const RAddUser = Joi.object({
+  body: IAddUser.required(),
 });
 
 // API
@@ -104,20 +115,10 @@ export const RUpdateUser = Joi.object({
   body: Joi.object()
     .keys({
       email: Joi.string().email(),
-      password: Joi.string().custom(password),
     })
     .min(1),
 });
 
-export const IJoinCooperative = Joi.object({
-  username: Joi.string().required(),
-  statement: IDocument.required(),
-});
-
-export const RJoinCooperative = Joi.object({
-  body: IJoinCooperative.required(),
-});
-
 /**
  * @swagger
  * components:

components/coopback/tests/fixtures/participant.fixture.ts

@@ -1,17 +1,11 @@
-import mongoose from 'mongoose';
-import bcrypt from 'bcryptjs';
 import faker from 'faker';
-import User from '../../src/models/user.model';
 import { generateUsername } from '../utils/generateUsername';
-import { Cooperative } from 'cooptypes';
 import { ICreateUser } from '../../src/types';
 
-const password = 'password1';
 const email1 = faker.internet.email().toLowerCase();
 
 export const participantOne: ICreateUser = {
   email: email1,
-  password,
   username: generateUsername(),
   public_key: 'EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV',
   role: 'user',

components/coopback/tests/fixtures/user.fixture.ts

@@ -7,10 +7,6 @@ import { Cooperative } from 'cooptypes';
 import { ICreateUser } from '../../src/types';
 import { ObjectId } from 'mongodb';
 
-const password = 'password1';
-const salt = bcrypt.genSaltSync(8);
-const hashedPassword = bcrypt.hashSync(password, salt);
-
 const generateRandomId = () => new mongoose.Types.ObjectId();
 
 type testUser = Omit<IUser, 'getPrivateData' | 'isPasswordMatch' | 'private_data'> & {
@@ -33,7 +29,6 @@ const adminUsername = generateUsername();
 export const admin: testUser = {
   _id: generateRandomId(),
   email: email1,
-  password,
   status: 'active',
   has_account: false,
   message: '',
@@ -68,7 +63,6 @@ const usernameOne = generateUsername();
 export const userOne: testUser = {
   _id: generateRandomId(),
   email: email2,
-  password,
   has_account: false,
   status: 'active',
   message: '',
@@ -104,7 +98,6 @@ export const userTwo: testUser = {
   _id: generateRandomId(),
   email: email3,
   has_account: false,
-  password,
   status: 'active',
   message: '',
   is_registered: true,
@@ -138,7 +131,6 @@ export const chairman: testUser = {
   _id: generateRandomId(),
   email: email4,
   has_account: false,
-  password,
   status: 'active',
   message: '',
   is_registered: true,
@@ -171,7 +163,6 @@ export const chairman: testUser = {
 export const voskhod: testUser = {
   _id: generateRandomId(),
   email: email5,
-  password,
   has_account: false,
   status: 'active',
   message: '',
@@ -259,7 +250,7 @@ export const insertUsers = async (users: testUser[]) => {
   for (const user of users) {
     const { type, individual_data, organization_data, entrepreneur_data, block_num, ...rest } = user;
 
-    await User.insertMany([{ ...rest, type, password: hashedPassword }]);
+    await User.insertMany([{ ...rest, type }]);
 
     if (type === 'individual' && individual_data) {
       await insertPrivateIndividualUserData({

components/coopback/tests/integration/auth.test.ts

@@ -29,7 +29,6 @@ describe('Auth routes', () => {
 
       newUser = {
         email,
-        password: 'password1',
         role: 'user',
         public_key: 'EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV',
         username: generateUsername(),
@@ -50,8 +49,6 @@ describe('Auth routes', () => {
     test('should return 201 and successfully register user if request data is ok', async () => {
       const res = await request(app).post('/v1/users').send(newUser).expect(httpStatus.CREATED);
 
-      expect(res.body.user).not.toHaveProperty('password');
-
       expect(res.body.user).toEqual({
         id: expect.anything(),
         email: newUser.email,
@@ -76,7 +73,6 @@ describe('Auth routes', () => {
 
       expect(dbUser).toBeDefined();
 
-      expect(dbUser?.password).not.toBe(newUser.password);
       expect(dbUser).toMatchObject({ email: newUser.email, role: 'user', is_email_verified: false });
 
       expect(res.body.tokens).toEqual({
@@ -97,26 +93,10 @@ describe('Auth routes', () => {
 
       await request(app).post('/v1/users').send(newUser).expect(httpStatus.BAD_REQUEST);
     });
-
-    test('should return 400 error if password length is less than 8 characters', async () => {
-      newUser.password = 'passwo1';
-
-      await request(app).post('/v1/users').send(newUser).expect(httpStatus.BAD_REQUEST);
-    });
-
-    test('should return 400 error if password does not contain both letters and numbers', async () => {
-      newUser.password = 'password';
-
-      await request(app).post('/v1/users').send(newUser).expect(httpStatus.BAD_REQUEST);
-
-      newUser.password = '11111111';
-
-      await request(app).post('/v1/users').send(newUser).expect(httpStatus.BAD_REQUEST);
-    });
   });
 
   describe('POST /v1/auth/login', () => {
-    test('should return 200 and login user if email and password match', async () => {
+    test('should return 200 and login user if email and signature match', async () => {
       await insertUsers([userOne]);
 
       const now = (await getBlockchainInfo()).head_block_time;
@@ -154,10 +134,16 @@ describe('Auth routes', () => {
     test('should return 401 error if there are no users with that email', async () => {
       const now = (await getBlockchainInfo()).head_block_time;
 
+      const privateKey = PrivateKey.fromString('5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3');
+
+      const bytes = Bytes.fromString(now, 'utf8');
+      const checksum = Checksum256.hash(bytes);
+      const signature = privateKey.signDigest(checksum);
+
       const loginCredentials = {
         now,
         email: userOne.email,
-        signature: userOne.password,
+        signature,
       };
 
       const res = await request(app).post('/v1/auth/login').send(loginCredentials).expect(httpStatus.UNAUTHORIZED);
@@ -166,7 +152,9 @@ describe('Auth routes', () => {
     });
 
     // test('should return 401 error if signature is wrong', async () => {
+
     // Восстановить проверку. Необходимо подложить аккаунт тестового юзера в коде вместо обращения к блокчейну.
+
     // await insertUsers([userOne]);
     // const now = (await getBlockchainInfo()).head_block_time;
     // const privateKey = PrivateKey.fromString('5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3');
@@ -288,14 +276,14 @@ describe('Auth routes', () => {
       jest.spyOn(emailService.transport, 'sendMail').mockResolvedValue();
     });
 
-    test('should return 204 and send reset password email to the user', async () => {
+    test('should return 204 and send reset key email to the user', async () => {
       await insertUsers([userOne]);
-      const sendResetPasswordEmailSpy = jest.spyOn(emailService, 'sendResetPasswordEmail');
+      const sendResetKeyEmailSpy = jest.spyOn(emailService, 'sendResetKeyEmail');
 
       await request(app).post('/v1/auth/lost-key').send({ email: userOne.email }).expect(httpStatus.NO_CONTENT);
 
-      expect(sendResetPasswordEmailSpy).toHaveBeenCalledWith(userOne.email, expect.any(String));
-      const resetKeyToken = sendResetPasswordEmailSpy.mock.calls[0][1];
+      expect(sendResetKeyEmailSpy).toHaveBeenCalledWith(userOne.email, expect.any(String));
+      const resetKeyToken = sendResetKeyEmailSpy.mock.calls[0][1];
       const dbResetPasswordTokenDoc = await Token.findOne({ token: resetKeyToken, user: userOne._id.toString() });
       expect(dbResetPasswordTokenDoc).toBeDefined();
     });
@@ -314,13 +302,15 @@ describe('Auth routes', () => {
   });
 
   describe('POST /v1/auth/reset-key', () => {
-    test('should return 204 and reset the password', async () => {
+    test('should return 204 and reset the key', async () => {
       await insertUsers([userOne]);
       const expires = moment().add(config.jwt.resetPasswordExpirationMinutes, 'minutes');
       const resetKeyToken = tokenService.generateToken(userOne._id, expires, tokenTypes.RESET_PASSWORD);
       await tokenService.saveToken(resetKeyToken, userOne._id, expires, tokenTypes.RESET_PASSWORD);
 
-      const res = await request(app).post('/v1/auth/reset-key').send({ token: resetKeyToken, password: 'password2' });
+      const res = await request(app)
+        .post('/v1/auth/reset-key')
+        .send({ token: resetKeyToken, public_key: userOne.public_key });
 
       expect(res.status).toBe(httpStatus.NO_CONTENT);
 
@@ -328,9 +318,6 @@ describe('Auth routes', () => {
       expect(dbUser).not.toBeUndefined();
 
       if (dbUser) {
-        const isPasswordMatch = await bcrypt.compare('password2', dbUser.password);
-        expect(isPasswordMatch).toBe(true);
-
         const dbResetPasswordTokenCount = await Token.countDocuments({
           user: userOne._id.toString(),
           type: tokenTypes.RESET_PASSWORD,
@@ -339,13 +326,16 @@ describe('Auth routes', () => {
       }
     });
 
-    test('should return 400 if reset password token is missing', async () => {
+    test('should return 400 if reset key token is missing', async () => {
       await insertUsers([userOne]);
 
-      await request(app).post('/v1/auth/reset-key').send({ password: 'password2' }).expect(httpStatus.BAD_REQUEST);
+      await request(app)
+        .post('/v1/auth/reset-key')
+        .send({ public_key: 'EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV' })
+        .expect(httpStatus.BAD_REQUEST);
     });
 
-    test('should return 401 if reset password token is blacklisted', async () => {
+    test('should return 401 if reset key token is blacklisted', async () => {
       await insertUsers([userOne]);
       const expires = moment().add(config.jwt.resetPasswordExpirationMinutes, 'minutes');
       const resetKeyToken = tokenService.generateToken(userOne._id, expires, tokenTypes.RESET_PASSWORD);
@@ -357,7 +347,7 @@ describe('Auth routes', () => {
         .expect(httpStatus.UNAUTHORIZED);
     });
 
-    test('should return 401 if reset password token is expired', async () => {
+    test('should return 401 if reset key token is expired', async () => {
       await insertUsers([userOne]);
       const expires = moment().subtract(1, 'minutes');
       const resetKeyToken = tokenService.generateToken(userOne._id, expires, tokenTypes.RESET_PASSWORD);
@@ -379,30 +369,6 @@ describe('Auth routes', () => {
         .send({ token: resetKeyToken, public_key: 'EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV' })
         .expect(httpStatus.UNAUTHORIZED);
     });
-
-    test('should return 400 if password is missing or invalid', async () => {
-      await insertUsers([userOne]);
-      const expires = moment().add(config.jwt.resetPasswordExpirationMinutes, 'minutes');
-      const resetKeyToken = tokenService.generateToken(userOne._id, expires, tokenTypes.RESET_PASSWORD);
-      await tokenService.saveToken(resetKeyToken, userOne._id, expires, tokenTypes.RESET_PASSWORD);
-
-      await request(app).post('/v1/auth/reset-key').send({ token: resetKeyToken }).expect(httpStatus.BAD_REQUEST);
-
-      await request(app)
-        .post('/v1/auth/reset-key')
-        .send({ token: resetKeyToken, public_key: 'stort' })
-        .expect(httpStatus.BAD_REQUEST);
-
-      await request(app)
-        .post('/v1/auth/reset-key')
-        .send({ token: resetKeyToken, public_key: 'password' })
-        .expect(httpStatus.BAD_REQUEST);
-
-      await request(app)
-        .post('/v1/auth/reset-key')
-        .send({ token: resetKeyToken, public_key: '11111111' })
-        .expect(httpStatus.BAD_REQUEST);
-    });
   });
 
   describe('POST /v1/auth/send-verification-email', () => {

components/coopback/tests/integration/documents.test.ts

@@ -56,7 +56,7 @@ describe('Проверка получения документов', () => {
         skip_save: false,
       };
 
-      let res = await request(app)
+      const res = await request(app)
         .post('/v1/documents/generate')
         .set('Authorization', `Bearer ${registeredUser.body.tokens.access.token}`)
         .send(options);

components/coopback/tests/integration/joincoop.test.ts

@@ -26,7 +26,6 @@ describe('Проверка данных', () => {
     const email = faker.internet.email().toLowerCase();
     newUser = {
       email: email,
-      password: 'password1',
       role: 'user',
       public_key: 'EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV',
       username: generateUsername(),
@@ -51,7 +50,6 @@ describe('Проверка данных', () => {
       const email = faker.internet.email().toLowerCase();
       newUser = {
         email: email,
-        password: 'password1',
         role: 'user',
         public_key: 'EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV',
         username: generateUsername(),

components/coopback/tests/integration/payments.test.ts

@@ -67,7 +67,6 @@ describe('Проверка получения документов', () => {
       const email = faker.internet.email().toLowerCase();
       const newUser = {
         email: email,
-        password: 'password1',
         role: 'user',
         public_key: 'EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV',
         username: generateUsername(),

components/coopback/tests/integration/user.test.ts

@@ -4,10 +4,10 @@ import app from '../../src/app';
 import { setupTestDB } from '../utils/setupTestDB';
 import { User } from '../../src/models';
 import { userOne, userTwo, admin, insertUsers } from '../fixtures/user.fixture';
-import { userOneAccessToken, adminAccessToken } from '../fixtures/token.fixture';
+import { userOneAccessToken, adminAccessToken, userTwoAccessToken } from '../fixtures/token.fixture';
 import request from 'supertest';
 import { generateUsername } from '../utils/generateUsername';
-import { IDocument, IIndividualData, IJoinCooperative } from '../../src/types';
+import { IIndividualData } from '../../src/types';
 
 setupTestDB();
 
@@ -19,7 +19,6 @@ describe('User routes', () => {
       const email = faker.internet.email().toLowerCase();
       newUser = {
         email: email,
-        password: 'password1',
         role: 'user',
         public_key: 'EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV',
         username: generateUsername(),
@@ -51,11 +50,9 @@ describe('User routes', () => {
       expect(res.body.user).toBeDefined();
       expect(res.body.tokens).toBeDefined();
 
-      expect(res.body.user).not.toHaveProperty('password');
-
       const dbUser = await User.findOne({ username: newUser.username });
       expect(dbUser).toBeDefined();
-      expect(dbUser?.password).not.toBe(newUser.password);
+
       const privateData = (await dbUser?.getPrivateData()) as IIndividualData;
       expect(privateData).toBeDefined();
 
@@ -65,23 +62,15 @@ describe('User routes', () => {
       expect(dbUser?.toObject()).toMatchObject({ email: newUser.email, role: newUser.role, is_email_verified: false });
     });
 
-    test('should be able to create an admin as well', async () => {
+    test('should not be able to create an admin as well', async () => {
       await insertUsers([admin]);
       newUser.role = 'member';
 
-      const res = await request(app)
+      await request(app)
         .post('/v1/users')
         .set('Authorization', `Bearer ${adminAccessToken}`)
         .send(newUser)
-        .expect(httpStatus.CREATED);
-
-      expect(res.body.user).toBeDefined();
-      expect(res.body.tokens).toBeDefined();
-
-      expect(res.body.user.role).toBe('member');
-
-      const dbUser = await User.findOne({ username: newUser.username });
-      expect(dbUser?.role).toBe('member');
+        .expect(httpStatus.BAD_REQUEST);
     });
 
     test('успешная регистрация без токена доступа', async () => {
@@ -122,36 +111,6 @@ describe('User routes', () => {
         .expect(httpStatus.BAD_REQUEST);
     });
 
-    test('should return 400 error if password length is less than 8 characters', async () => {
-      await insertUsers([admin]);
-      newUser.password = 'passwo1';
-
-      await request(app)
-        .post('/v1/users')
-        .set('Authorization', `Bearer ${adminAccessToken}`)
-        .send(newUser)
-        .expect(httpStatus.BAD_REQUEST);
-    });
-
-    test('should return 400 error if password does not contain both letters and numbers', async () => {
-      await insertUsers([admin]);
-      newUser.password = 'password';
-
-      await request(app)
-        .post('/v1/users')
-        .set('Authorization', `Bearer ${adminAccessToken}`)
-        .send(newUser)
-        .expect(httpStatus.BAD_REQUEST);
-
-      newUser.password = '1111111';
-
-      await request(app)
-        .post('/v1/users')
-        .set('Authorization', `Bearer ${adminAccessToken}`)
-        .send(newUser)
-        .expect(httpStatus.BAD_REQUEST);
-    });
-
     test('should return 400 error if role is neither user nor admin', async () => {
       await insertUsers([admin]);
       newUser.role = 'invalid';
@@ -164,6 +123,71 @@ describe('User routes', () => {
     });
   });
 
+  describe('POST /v1/users/add', () => {
+    let newUser;
+
+    beforeEach(() => {
+      const email = faker.internet.email().toLowerCase();
+      newUser = {
+        email: email,
+        referer: '',
+        type: 'individual',
+        individual_data: {
+          first_name: faker.name.firstName(),
+          last_name: faker.name.lastName(),
+          middle_name: '',
+          birthdate: '2023-04-01',
+          phone: '+1234567890',
+          email: email,
+          full_address: 'Russia, Moscow, Tverskaya street, 10',
+        },
+      };
+    });
+
+    test('should return 201 and successfully add new user if data is ok', async () => {
+      await insertUsers([admin]);
+
+      const res = await request(app).post('/v1/users/add').set('Authorization', `Bearer ${adminAccessToken}`).send(newUser);
+
+      // if (res.status !== httpStatus.CREATED) {
+      // console.error(res.body); // Выводит тело ответа, если статус не CREATED
+      // }
+
+      expect(res.status).toBe(httpStatus.CREATED);
+
+      expect(res.body.user).toBeDefined();
+      expect(res.body.user.username).toBeDefined();
+
+      const dbUser = await User.findOne({ username: res.body.user.username });
+      expect(dbUser).toBeDefined();
+
+      const privateData = (await dbUser?.getPrivateData()) as IIndividualData;
+      expect(privateData).toBeDefined();
+
+      expect(privateData.first_name).toEqual(newUser.individual_data?.first_name);
+      expect(privateData.last_name).toEqual(newUser.individual_data?.last_name);
+
+      expect(dbUser?.toObject()).toMatchObject({ email: newUser.email, role: 'user', is_email_verified: false });
+    });
+
+    test('should return 403 if service user is not admin but data new user is ok', async () => {
+      await insertUsers([userTwo]);
+
+      const res = await request(app)
+        .post('/v1/users/add')
+        .set('Authorization', `Bearer ${userTwoAccessToken}`)
+        .send(newUser);
+
+      expect(res.status).toBe(httpStatus.FORBIDDEN);
+    });
+
+    test('should return 401 if service user is not have access token', async () => {
+      const res = await request(app).post('/v1/users/add').send(newUser);
+
+      expect(res.status).toBe(httpStatus.UNAUTHORIZED);
+    });
+  });
+
   describe('GET /v1/users', () => {
     test('should return 200 and apply the default query options', async () => {
       await insertUsers([userOne, userTwo, admin]);
@@ -513,7 +537,6 @@ describe('User routes', () => {
       await insertUsers([userOne]);
       const updateBody = {
         email: faker.internet.email().toLowerCase(),
-        password: 'newPassword1',
       };
 
       const res = await request(app)
@@ -528,7 +551,6 @@ describe('User routes', () => {
       await insertUsers([userOne, admin]);
       const updateBody = {
         email: faker.internet.email().toLowerCase(),
-        password: 'newPassword1',
       };
 
       const res = await request(app)
@@ -542,7 +564,6 @@ describe('User routes', () => {
 
       const dbUser = await User.findById(userOne._id);
       expect(dbUser).toBeDefined();
-      expect(dbUser?.password).not.toBe(updateBody.password);
       expect(dbUser).toMatchObject({ email: updateBody.email, role: 'user' });
     });
 
@@ -550,7 +571,6 @@ describe('User routes', () => {
       await insertUsers([userOne]);
       const updateBody = {
         email: faker.internet.email().toLowerCase(),
-        password: 'newPassword1',
       };
 
       await request(app).patch(`/v1/users/${userOne.username}`).send(updateBody).expect(httpStatus.UNAUTHORIZED);
@@ -560,7 +580,6 @@ describe('User routes', () => {
       await insertUsers([userOne, userTwo]);
       const updateBody = {
         email: faker.internet.email().toLowerCase(),
-        password: 'newPassword1',
       };
 
       await request(app)
@@ -574,7 +593,6 @@ describe('User routes', () => {
       await insertUsers([userOne, admin]);
       const updateBody = {
         email: faker.internet.email().toLowerCase(),
-        password: 'newPassword1',
       };
 
       await request(app)
@@ -588,7 +606,6 @@ describe('User routes', () => {
       await insertUsers([admin]);
       const updateBody = {
         email: faker.internet.email().toLowerCase(),
-        password: 'newPassword1',
       };
 
       await request(app)
@@ -600,7 +617,7 @@ describe('User routes', () => {
 
     test('should return 400 if email is invalid', async () => {
       await insertUsers([userOne, admin]);
-      const updateBody = { email: 'invalidEmail', password: 'GoodPassword!23' };
+      const updateBody = { email: 'invalidEmail' };
 
       await request(app)
         .patch(`/v1/users/${userOne.username}`)
@@ -611,7 +628,7 @@ describe('User routes', () => {
 
     test('should return 400 if email is already taken', async () => {
       await insertUsers([userOne, userTwo, admin]);
-      const updateBody = { email: userTwo.email, password: 'GoodPassword!23' };
+      const updateBody = { email: userTwo.email };
 
       await request(app)
         .patch(`/v1/users/${userOne.username}`)
@@ -620,41 +637,9 @@ describe('User routes', () => {
         .expect(httpStatus.BAD_REQUEST);
     });
 
-    test('should return 400 if password length is less than 8 characters', async () => {
-      await insertUsers([userOne, admin]);
-      const updateBody = { password: 'passwo1' };
-
-      await request(app)
-        .patch(`/v1/users/${userOne.username}`)
-        .set('Authorization', `Bearer ${adminAccessToken}`)
-        .send(updateBody)
-        .expect(httpStatus.BAD_REQUEST);
-    });
-
-    test('should return 400 if password does not contain both letters and numbers', async () => {
-      await insertUsers([userOne, admin]);
-      const updateBody = { password: 'password' };
-
-      await request(app)
-        .patch(`/v1/users/${userOne.username}`)
-        .set('Authorization', `Bearer ${adminAccessToken}`)
-        .send(updateBody)
-        .expect(httpStatus.BAD_REQUEST);
-
-      updateBody.password = '11111111';
-
-      await request(app)
-        .patch(`/v1/users/${userOne.username}`)
-        .set('Authorization', `Bearer ${adminAccessToken}`)
-        .send(updateBody)
-        .expect(httpStatus.BAD_REQUEST);
-    });
-
-    //
-
     test('should return 400 if email is my email then taken', async () => {
       await insertUsers([userOne, admin]);
-      const updateBody = { email: userOne.email, password: 'veryStrongPassword!2' };
+      const updateBody = { email: userOne.email };
 
       await request(app)
         .patch(`/v1/users/${userOne.username}`)

components/coopback/tests/unit/models/user.model.test.ts

@@ -10,7 +10,6 @@ describe('User model', () => {
       newUser = {
         name: faker.name.findName(),
         email: faker.internet.email().toLowerCase(),
-        password: 'password1',
         role: 'user',
         public_key: 'EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV',
         type: 'individual',
@@ -27,36 +26,9 @@ describe('User model', () => {
       await expect(new User(newUser).validate()).rejects.toThrow();
     });
 
-    test('should throw a validation error if password length is less than 8 characters', async () => {
-      newUser.password = 'passwo1';
-      await expect(new User(newUser).validate()).rejects.toThrow();
-    });
-
-    test('should throw a validation error if password does not contain numbers', async () => {
-      newUser.password = 'password';
-      await expect(new User(newUser).validate()).rejects.toThrow();
-    });
-
-    test('should throw a validation error if password does not contain letters', async () => {
-      newUser.password = '11111111';
-      await expect(new User(newUser).validate()).rejects.toThrow();
-    });
-
     test('should throw a validation error if role is unknown', async () => {
       newUser.role = 'invalid';
       await expect(new User(newUser).validate()).rejects.toThrow();
     });
   });
-
-  describe('User toJSON()', () => {
-    test('should not return user password when toJSON is called', () => {
-      const newUser = {
-        name: faker.name.findName(),
-        email: faker.internet.email().toLowerCase(),
-        password: 'password1',
-        role: 'user',
-      };
-      expect(new User(newUser).toJSON()).not.toHaveProperty('password');
-    });
-  });
 });

components/coopdoc-generator-ts/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.0.78](https://github.com/copenomics/coopdoc-generator-ts/compare/coopdoc-generator-ts@1.0.77...coopdoc-generator-ts@1.0.78) (2024-08-25)
+
+**Note:** Version bump only for package coopdoc-generator-ts
+
+
+
+
+
+## [1.0.77](https://github.com/copenomics/coopdoc-generator-ts/compare/coopdoc-generator-ts@1.0.76...coopdoc-generator-ts@1.0.77) (2024-08-25)
+
+**Note:** Version bump only for package coopdoc-generator-ts
+
+
+
+
+
+## [1.0.76](https://github.com/copenomics/coopdoc-generator-ts/compare/coopdoc-generator-ts@1.0.75...coopdoc-generator-ts@1.0.76) (2024-08-25)
+
+**Note:** Version bump only for package coopdoc-generator-ts
+
+
+
+
+
+## [1.0.75](https://github.com/copenomics/coopdoc-generator-ts/compare/coopdoc-generator-ts@1.0.75-alpha.1...coopdoc-generator-ts@1.0.75) (2024-08-25)
+
+**Note:** Version bump only for package coopdoc-generator-ts
+
+
+
+
+
+## [1.0.74](https://github.com/copenomics/coopdoc-generator-ts/compare/coopdoc-generator-ts@1.0.73...coopdoc-generator-ts@1.0.74) (2024-08-13)
+
+**Note:** Version bump only for package coopdoc-generator-ts
+
+
+
+
+
 ## [1.0.73](https://github.com/copenomics/coopdoc-generator-ts/compare/coopdoc-generator-ts@1.0.73-alpha.0...coopdoc-generator-ts@1.0.73) (2024-08-05)
 
 **Note:** Version bump only for package coopdoc-generator-ts

components/coopdoc-generator-ts/build.config.ts

@@ -3,6 +3,11 @@ import { defineBuildConfig } from 'unbuild'
 export default defineBuildConfig({
   entries: [
     'src/index',
+    // {
+    //   input: 'src/Templates/index',
+    //   outDir: 'dist',
+    //   name: 'Templates',
+    // },
   ],
   declaration: true,
   clean: false,

components/coopdoc-generator-ts/package.json

@@ -1,8 +1,8 @@
 {
   "name": "coopdoc-generator-ts",
   "type": "module",
-  "version": "1.0.73",
-  "private": true,
+  "version": "1.0.79-alpha.2",
+  "private": false,
   "packageManager": "pnpm@9.0.6",
   "description": "",
   "author": "Alex Ant <chairman.voskhod@gmail.com>",
@@ -17,6 +17,7 @@
   "sideEffects": false,
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
       "require": "./dist/index.cjs"
     }
@@ -49,7 +50,6 @@
     "ajv-formats": "^3.0.1",
     "ajv-i18n": "^4.2.0",
     "axios": "^1.7.2",
-    "cooparser-ts": "workspace:*",
     "cooptypes": "workspace:*",
     "dotenv": "^16.4.5",
     "eosjs-ecc": "^4.0.7",

components/coopdoc-generator-ts/src/Actions/1.WalletAgreement.ts

@@ -0,0 +1,39 @@
+import { WalletAgreement } from '../templates'
+import { DocFactory } from '../Factory'
+import type { IGeneratedDocument, IMetaDocument, ITemplate } from '../Interfaces'
+import type { MongoDBConnector } from '../Services/Databazor'
+
+export { WalletAgreement as Template } from '../templates'
+
+export class Factory extends DocFactory<WalletAgreement.Action> {
+  constructor(storage: MongoDBConnector) {
+    super(storage)
+  }
+
+  async generateDocument(options: WalletAgreement.Action): Promise<IGeneratedDocument> {
+    let template: ITemplate<WalletAgreement.Model>
+
+    if (process.env.SOURCE === 'local') {
+      template = WalletAgreement.Template
+    }
+    else {
+      template = await this.getTemplate(options.coopname, WalletAgreement.registry_id, options.block_num)
+    }
+
+    const meta: IMetaDocument = await super.getMeta({ title: template.title, ...options })
+
+    const combinedData: WalletAgreement.Model = {
+      meta,
+    }
+
+    await super.validate(combinedData, template.model)
+
+    const translation = template.translations[meta.lang]
+
+    const document: IGeneratedDocument = await super.generatePDF(null, template.context, combinedData, translation, meta)
+
+    await super.saveDraft(document)
+
+    return document
+  }
+}

components/coopdoc-generator-ts/src/Actions/100.ParticipantApplication.ts

@@ -1,26 +1,25 @@
-import type { IJoinCoopAction } from '../Templates/100.ParticipantApplication'
+import { DraftContract } from 'cooptypes'
 import { DocFactory } from '../Factory'
 import type { IGeneratedDocument, IMetaDocument, ITemplate } from '../Interfaces'
 import type { MongoDBConnector } from '../Services/Databazor'
-import { ParticipantApplicationTemplate } from '../Templates/100.ParticipantApplication'
 import DataService from '../Services/Databazor/DataService'
-import type { IGenerateJoinCoop } from '../Interfaces/Actions'
+import { ParticipantApplication } from '../templates'
 
-export const registry_id = 100
+export { ParticipantApplication as Template } from '../templates'
 
-export class JoinCoopTemplateFactory extends DocFactory {
+export class Factory extends DocFactory<ParticipantApplication.Action> {
   constructor(storage: MongoDBConnector) {
     super(storage)
   }
 
-  async generateDocument(options: IGenerateJoinCoop): Promise<IGeneratedDocument> {
-    let template: ITemplate<IJoinCoopAction>
+  async generateDocument(options: ParticipantApplication.Action): Promise<IGeneratedDocument> {
+    let template: ITemplate<ParticipantApplication.Model>
 
     if (process.env.SOURCE === 'local') {
-      template = ParticipantApplicationTemplate
+      template = ParticipantApplication.Template
     }
     else {
-      template = await this.getTemplate(registry_id, options.block_num)
+      template = await this.getTemplate(DraftContract.contractName.production, ParticipantApplication.registry_id, options.block_num)
     }
 
     const user = await super.getUser(options.username, options.block_num)
@@ -32,8 +31,11 @@ export class JoinCoopTemplateFactory extends DocFactory {
     const coop = await super.getCooperative(options.coopname, options.block_num)
 
     let { signature, ...modifiedOptions } = options
+    const meta: IMetaDocument = await super.getMeta({ title: template.title, ...modifiedOptions }) // Генерируем мета-данные
 
-    const meta: IMetaDocument = await super.getMeta({ registry_id, title: template.title, ...modifiedOptions }) // Генерируем мета-данные
+    console.log('generator options: ', options)
+
+    console.log('generator meta: ', meta)
 
     interface SignatureData {
       username: string
@@ -41,7 +43,7 @@ export class JoinCoopTemplateFactory extends DocFactory {
       signature: string
     }
 
-    const data_service = new DataService<SignatureData>(this.storage, 'SignatureData')
+    const data_service = new DataService<SignatureData>(this.storage, 'signatures')
 
     // пропуск сохранения необходим при вступлении для того, чтобы подготовить документ только для отображения без сохранения
     if (!options.skip_save) {
@@ -59,12 +61,12 @@ export class JoinCoopTemplateFactory extends DocFactory {
       }
       else {
         // если подпись указана - сохраняем в хранилище
-        const data_service = new DataService<SignatureData>(this.storage, 'SignatureData')
+        const data_service = new DataService<SignatureData>(this.storage, 'signatures')
         await data_service.save({ username: options.username, block_num: meta.block_num, signature })
       }
     }
 
-    const combinedData: IJoinCoopAction = { ...userData, meta, coop, type: user.type, signature }
+    const combinedData: ParticipantApplication.Model = { ...userData, meta, coop, type: user.type, signature }
 
     // валидируем скомбинированные данные
     await super.validate(combinedData, template.model)

components/coopdoc-generator-ts/src/Actions/2.RegulationElectronicSignature.ts

@@ -0,0 +1,39 @@
+import { RegulationElectronicSignature } from '../templates'
+import { DocFactory } from '../Factory'
+import type { IGeneratedDocument, IMetaDocument, ITemplate } from '../Interfaces'
+import type { MongoDBConnector } from '../Services/Databazor'
+
+export { RegulationElectronicSignature as Template } from '../templates'
+
+export class Factory extends DocFactory<RegulationElectronicSignature.Action> {
+  constructor(storage: MongoDBConnector) {
+    super(storage)
+  }
+
+  async generateDocument(options: RegulationElectronicSignature.Action): Promise<IGeneratedDocument> {
+    let template: ITemplate<RegulationElectronicSignature.Model>
+
+    if (process.env.SOURCE === 'local') {
+      template = RegulationElectronicSignature.Template
+    }
+    else {
+      template = await this.getTemplate(options.coopname, RegulationElectronicSignature.registry_id, options.block_num)
+    }
+
+    const meta: IMetaDocument = await super.getMeta({ title: template.title, ...options })
+
+    const combinedData: RegulationElectronicSignature.Model = {
+      meta,
+    }
+
+    await super.validate(combinedData, template.model)
+
+    const translation = template.translations[meta.lang]
+
+    const document: IGeneratedDocument = await super.generatePDF(null, template.context, combinedData, translation, meta)
+
+    await super.saveDraft(document)
+
+    return document
+  }
+}

components/coopdoc-generator-ts/src/Actions/3.PrivacyPolicy.ts

@@ -0,0 +1,39 @@
+import { PrivacyPolicy } from '../templates'
+import { DocFactory } from '../Factory'
+import type { IGeneratedDocument, IMetaDocument, ITemplate } from '../Interfaces'
+import type { MongoDBConnector } from '../Services/Databazor'
+
+export { PrivacyPolicy as Template } from '../templates'
+
+export class Factory extends DocFactory<PrivacyPolicy.Action> {
+  constructor(storage: MongoDBConnector) {
+    super(storage)
+  }
+
+  async generateDocument(options: PrivacyPolicy.Action): Promise<IGeneratedDocument> {
+    let template: ITemplate<PrivacyPolicy.Model>
+
+    if (process.env.SOURCE === 'local') {
+      template = PrivacyPolicy.Template
+    }
+    else {
+      template = await this.getTemplate(options.coopname, PrivacyPolicy.registry_id, options.block_num)
+    }
+
+    const meta: IMetaDocument = await super.getMeta({ title: template.title, ...options })
+
+    const combinedData: PrivacyPolicy.Model = {
+      meta,
+    }
+
+    await super.validate(combinedData, template.model)
+
+    const translation = template.translations[meta.lang]
+
+    const document: IGeneratedDocument = await super.generatePDF(null, template.context, combinedData, translation, meta)
+
+    await super.saveDraft(document)
+
+    return document
+  }
+}

components/coopdoc-generator-ts/src/Actions/4.UserAgreement.ts

@@ -0,0 +1,39 @@
+import { UserAgreement } from '../templates'
+import { DocFactory } from '../Factory'
+import type { IGeneratedDocument, IMetaDocument, ITemplate } from '../Interfaces'
+import type { MongoDBConnector } from '../Services/Databazor'
+
+export { UserAgreement as Template } from '../templates'
+
+export class Factory extends DocFactory<UserAgreement.Action> {
+  constructor(storage: MongoDBConnector) {
+    super(storage)
+  }
+
+  async generateDocument(options: UserAgreement.Action): Promise<IGeneratedDocument> {
+    let template: ITemplate<UserAgreement.Model>
+
+    if (process.env.SOURCE === 'local') {
+      template = UserAgreement.Template
+    }
+    else {
+      template = await this.getTemplate(options.coopname, UserAgreement.registry_id, options.block_num)
+    }
+
+    const meta: IMetaDocument = await super.getMeta({ title: template.title, ...options })
+
+    const combinedData: UserAgreement.Model = {
+      meta,
+    }
+
+    await super.validate(combinedData, template.model)
+
+    const translation = template.translations[meta.lang]
+
+    const document: IGeneratedDocument = await super.generatePDF(null, template.context, combinedData, translation, meta)
+
+    await super.saveDraft(document)
+
+    return document
+  }
+}

components/coopdoc-generator-ts/src/Actions/50.CoopenomicsAgreement.ts

@@ -0,0 +1,39 @@
+import { CoopenomicsAgreement } from '../templates'
+import { DocFactory } from '../Factory'
+import type { IGeneratedDocument, IMetaDocument, ITemplate } from '../Interfaces'
+import type { MongoDBConnector } from '../Services/Databazor'
+
+export { CoopenomicsAgreement as Template } from '../templates'
+
+export class Factory extends DocFactory<CoopenomicsAgreement.Action> {
+  constructor(storage: MongoDBConnector) {
+    super(storage)
+  }
+
+  async generateDocument(options: CoopenomicsAgreement.Action): Promise<IGeneratedDocument> {
+    let template: ITemplate<CoopenomicsAgreement.Model>
+
+    if (process.env.SOURCE === 'local') {
+      template = CoopenomicsAgreement.Template
+    }
+    else {
+      template = await this.getTemplate(options.coopname, CoopenomicsAgreement.registry_id, options.block_num)
+    }
+
+    const meta: IMetaDocument = await super.getMeta({ title: template.title, ...options })
+
+    const combinedData: CoopenomicsAgreement.Model = {
+      meta,
+    }
+
+    await super.validate(combinedData, template.model)
+
+    const translation = template.translations[meta.lang]
+
+    const document: IGeneratedDocument = await super.generatePDF(null, template.context, combinedData, translation, meta)
+
+    await super.saveDraft(document)
+
+    return document
+  }
+}

components/coopdoc-generator-ts/src/Actions/501.DecisionOfParticipantApplication.ts

@@ -1,32 +1,31 @@
-import type { IJoinCoopDecisionAction } from '../Templates/501.DecisionOfParticipantApplication'
+import { type Cooperative, DraftContract } from 'cooptypes'
 import { DocFactory } from '../Factory'
 import type {
-  IDecisionData,
   IGeneratedDocument,
   IMetaDocument,
   ITemplate,
 } from '../Interfaces'
 import type { MongoDBConnector } from '../Services/Databazor'
-import { DecisionOfParticipantApplicationTemplate } from '../Templates/501.DecisionOfParticipantApplication'
-import type { IGenerateJoinCoopDecision } from '../Interfaces/Actions'
 
-export const registry_id = 501
+import { DecisionOfParticipantApplication } from '../templates'
 
-export class DecisionOfJoinCoopTemplateFactory extends DocFactory {
+export { DecisionOfParticipantApplication as Template } from '../templates'
+
+export class Factory extends DocFactory<DecisionOfParticipantApplication.Action> {
   constructor(storage: MongoDBConnector) {
     super(storage)
   }
 
   async generateDocument(
-    options: IGenerateJoinCoopDecision,
+    options: DecisionOfParticipantApplication.Action,
   ): Promise<IGeneratedDocument> {
-    let template: ITemplate<IJoinCoopDecisionAction>
+    let template: ITemplate<DecisionOfParticipantApplication.Model>
 
     if (process.env.SOURCE === 'local') {
-      template = DecisionOfParticipantApplicationTemplate
+      template = DecisionOfParticipantApplication.Template
     }
     else {
-      template = await this.getTemplate(registry_id, options.block_num)
+      template = await this.getTemplate(DraftContract.contractName.production, DecisionOfParticipantApplication.registry_id, options.block_num)
     }
 
     const user = await super.getUser(options.username, options.block_num)
@@ -39,19 +38,18 @@ export class DecisionOfJoinCoopTemplateFactory extends DocFactory {
 
     // TODO необходимо строго типизировать мета-данные документов друг под друга!
     const meta: IMetaDocument = await super.getMeta({
-      registry_id,
       title: template.title,
       ...options,
     }) // Генерируем мета-данные
 
-    const decision: IDecisionData = await super.getDecision(
+    const decision: Cooperative.Document.IDecisionData = await super.getDecision(
       coop,
       options.coopname,
       options.decision_id,
       meta.created_at,
     )
 
-    const combinedData: IJoinCoopDecisionAction = {
+    const combinedData: DecisionOfParticipantApplication.Model = {
       ...userData,
       meta,
       coop,

components/coopdoc-generator-ts/src/Actions/index.ts

@@ -1,2 +1,8 @@
-export * as JoinCoop from './registrator.joincoop'
-export * as JoinCoopDecision from './registrator.joincoopdec'
+export * as WalletAgreement from './1.WalletAgreement'
+export * as RegulationElectronicSignature from './2.RegulationElectronicSignature'
+export * as PrivacyPolicy from './3.PrivacyPolicy'
+export * as UserAgreement from './4.UserAgreement'
+export * as CoopenomicsAgreement from './50.CoopenomicsAgreement'
+
+export * as ParticipantApplication from './100.ParticipantApplication'
+export * as DecisionOfParticipantApplication from './501.DecisionOfParticipantApplication'

components/coopdoc-generator-ts/src/Factory/index.ts

@@ -1,10 +1,11 @@
 import type { JSONSchemaType } from 'ajv'
 import moment from 'moment-timezone'
+import type { Cooperative as TCooperative } from 'cooptypes'
 import { DraftContract, SovietContract } from 'cooptypes'
 import type { ICombinedData, IGeneratedDocument, IMetaDocument, IMetaDocumentPartial, ITemplate, ITranslations, externalDataTypes } from '../Interfaces'
 import type { MongoDBConnector } from '../Services/Databazor'
 import { Individual, Organization } from '../Models'
-import type { IDecisionData, IGenerate } from '../Interfaces/Documents'
+import type { IGenerate } from '../Interfaces/Documents'
 import { PDFService } from '../Services/Generator'
 import packageJson from '../../package.json'
 import { Validator } from '../Services/Validator'
@@ -17,8 +18,8 @@ import { getCurrentBlock } from '../Utils/getCurrentBlock'
 
 const packageVersion = packageJson.version
 
-export abstract class DocFactory {
-  abstract generateDocument(options: IGenerate): Promise<IGeneratedDocument>
+export abstract class DocFactory<T extends IGenerate> {
+  abstract generateDocument(options: T): Promise<IGeneratedDocument>
 
   public storage: MongoDBConnector
 
@@ -77,12 +78,12 @@ export abstract class DocFactory {
     return coop
   }
 
-  async getDecision(coop: CooperativeData, coopname: string, decision_id: number, created_at: string): Promise<IDecisionData> {
+  async getDecision(coop: CooperativeData, coopname: string, decision_id: number, created_at: string): Promise<TCooperative.Document.IDecisionData> {
     const votes_for_actions = (await getFetch(`${getEnvVar('SIMPLE_EXPLORER_API')}/get-actions`, new URLSearchParams({
       filter: JSON.stringify({
-        'account': process.env.SOVIET_CONTRACT,
+        'account': SovietContract.contractName.production,
         'name': SovietContract.Actions.Decisions.VoteFor.actionName,
-        'receiver': process.env.SOVIET_CONTRACT,
+        'receiver': SovietContract.contractName.production,
         'data.decision_id': String(decision_id),
         'data.coopname': coopname,
       }),
@@ -93,9 +94,9 @@ export abstract class DocFactory {
 
     const votes_against_actions = (await getFetch(`${getEnvVar('SIMPLE_EXPLORER_API')}/get-actions`, new URLSearchParams({
       filter: JSON.stringify({
-        'account': process.env.SOVIET_CONTRACT,
+        'account': SovietContract.contractName.production,
         'name': SovietContract.Actions.Decisions.VoteAgainst.actionName,
-        'receiver': process.env.SOVIET_CONTRACT,
+        'receiver': SovietContract.contractName.production,
         'data.decision_id': String(decision_id),
         'data.coopname': coopname,
       }),
@@ -123,13 +124,13 @@ export abstract class DocFactory {
     }
   }
 
-  async getTemplate<T>(registry_id: number, block_num?: number): Promise<ITemplate<T>> {
+  async getTemplate<T>(scope: string, registry_id: number, block_num?: number): Promise<ITemplate<T>> {
     const block_filter = block_num ? { block_num: { $lte: block_num } } : {}
 
     const templateResponse = await getFetch(`${getEnvVar('SIMPLE_EXPLORER_API')}/get-tables`, new URLSearchParams({
       filter: JSON.stringify({
         'code': DraftContract.contractName.production,
-        'scope': DraftContract.contractName.production,
+        'scope': scope,
         'table': DraftContract.Tables.Drafts.tableName,
         'value.registry_id': String(registry_id),
         ...block_filter,
@@ -144,9 +145,9 @@ export abstract class DocFactory {
     const translationsResponse = await getFetch(`${getEnvVar('SIMPLE_EXPLORER_API')}/get-tables`, new URLSearchParams({
       filter: JSON.stringify({
         'code': DraftContract.contractName.production,
-        'scope': DraftContract.contractName.production,
+        'scope': scope,
         'table': 'translations',
-        'value.draft_id': String(draft.id),
+        'value.draft_id': String(draft.registry_id),
         ...block_filter,
       }),
     }))
@@ -170,7 +171,7 @@ export abstract class DocFactory {
   }
 
   async generatePDF(
-    data: externalDataTypes,
+    data: externalDataTypes | null,
     context: string,
     vars: ICombinedData,
     translation: ITranslations,
@@ -185,13 +186,14 @@ export abstract class DocFactory {
     return document
   }
 
-  getFullName(data: externalDataTypes): string {
-    if ('first_name' in data)
-      return `${data.last_name} ${data.first_name} ${data.middle_name}`
-
-    if ('represented_by' in data)
-      return `${data.represented_by.last_name} ${data.represented_by.first_name} ${data.represented_by.middle_name}`
+  getFullName(data: externalDataTypes | null): string {
+    if (data) {
+      if ('first_name' in data)
+        return `${data.last_name} ${data.first_name} ${data.middle_name}`
 
+      if ('represented_by' in data)
+        return `${data.represented_by.last_name} ${data.represented_by.first_name} ${data.represented_by.middle_name}`
+    }
     return ''
   }
 
@@ -200,12 +202,11 @@ export abstract class DocFactory {
   }
 
   async getMeta<T extends IMetaDocumentPartial>({
-    code,
-    action,
     title,
     username,
     coopname,
     registry_id,
+    links = [],
     lang = 'ru',
     generator = 'coopjs',
     version = packageVersion, // TODO перенести в .env
@@ -219,8 +220,8 @@ export abstract class DocFactory {
     if (!title)
       throw new Error('Заголовок документа должен быть установлен')
 
-    if (!code || !action)
-      throw new Error('Параметры действия должны быть переданы')
+    if (!registry_id)
+      throw new Error('Параметр номера документа в реестре должен быть передан')
 
     if (created_at)
       dateWithTimezone = moment.tz(created_at, 'DD.MM.YYYY HH:mm', timezone).format('DD.MM.YYYY HH:mm').toString()
@@ -231,12 +232,11 @@ export abstract class DocFactory {
       block_num = await getCurrentBlock()
 
     return {
-      code,
-      action,
       title,
       lang,
       registry_id,
       generator,
+      links,
       version,
       coopname,
       username,

components/coopdoc-generator-ts/src/Interfaces/Actions.ts

@@ -1,4 +1,13 @@
 import type { Cooperative } from 'cooptypes'
 
-export type IGenerateJoinCoopDecision = Cooperative.Documents.IGenerateJoinCoopDecision
-export type IGenerateJoinCoop = Cooperative.Documents.IGenerateJoinCoop
+export type IGenerateJoinCoopDecision = Cooperative.Document.IGenerateJoinCoopDecision
+
+/**
+ * Интерфейс генерации заявления на вступление в кооператив
+ */
+export interface IGenerateJoinCoop extends IGenerate {
+  signature: string
+  skip_save: boolean
+}
+
+export type IGenerateAgreement = Cooperative.Document.IGenerateAgreement

components/coopdoc-generator-ts/src/Interfaces/Documents.ts

@@ -1,21 +1,11 @@
 import type { JSONSchemaType } from 'ajv'
 import type { Cooperative } from 'cooptypes'
-import type { DocumentsMappingByActionAndCode } from '../Templates/registry'
+import type { Registry } from '../templates/registry'
 import type { CooperativeData } from '../Models/Cooperative'
 import type { ExternalEntrepreneurData, ExternalIndividualData, ExternalOrganizationData } from '../Models'
 
 // Определение базового интерфейса для мета-информации
-export type IMetaDocument = Cooperative.Documents.IMetaDocument
-
-export interface IDecisionData {
-  id: number
-  date: string
-  time: string
-  votes_for: number
-  votes_against: number
-  votes_abstained: number
-  voters_percent: number
-}
+export type IMetaDocument = Cooperative.Document.IMetaDocument
 
 export interface IGeneratedDocument {
   full_title?: string
@@ -43,11 +33,11 @@ export interface ICombinedData {
   individual?: ExternalIndividualData
   organization?: ExternalOrganizationData
   entrepreneur?: ExternalEntrepreneurData
-  coop: CooperativeData
+  coop?: CooperativeData
   meta: IMetaDocument
 }
 
-export type Actions = keyof DocumentsMappingByActionAndCode
+export type Numbers = keyof typeof Registry
 export type LangType = 'ru'
 
 export interface IMetaDocumentPartial extends Partial<IMetaDocument> {
@@ -57,10 +47,4 @@ export interface IMetaDocumentPartial extends Partial<IMetaDocument> {
   title: string
 }
 
-export interface IGenerate extends Omit<Partial<IMetaDocument>, 'registry_id' | 'title'> {
-  code: string
-  action: string
-  coopname: string
-  username: string
-  [key: string]: any
-}
+export type IGenerate = Cooperative.Document.IGenerate

components/coopdoc-generator-ts/src/Interfaces/index.ts

@@ -1,4 +1,3 @@
 export * from './Documents'
 export * from './BankAccounts'
 export * from './Storage'
-export * from './Actions'

components/coopdoc-generator-ts/src/Models/Cooperative.ts

@@ -46,7 +46,7 @@ export class Cooperative {
   constructor(storage: MongoDBConnector) {
     this.db = storage
     this.cooperative = null
-    this.data_service = new DataService<CooperativeData>(storage, 'CooperativeData')
+    this.data_service = new DataService<CooperativeData>(storage, 'cooperatives')
   }
 
   async getOne(username: string, block_num?: number): Promise<CooperativeData> {

components/coopdoc-generator-ts/src/Models/Entrepreneur.ts

@@ -24,7 +24,7 @@ export class Entrepreneur {
   constructor(storage: MongoDBConnector, data?: ExternalEntrepreneurData) {
     this.db = storage
     this.entrepreneur = data
-    this.data_service = new DataService<InternalEntrepreneurData>(storage, 'EntrepreneurData')
+    this.data_service = new DataService<InternalEntrepreneurData>(storage, 'entrepreneurs')
   }
 
   validate(): ValidateResult {
@@ -74,7 +74,7 @@ export class Entrepreneur {
     return entr as ExternalEntrepreneurData
   }
 
-  async getMany(filter: Filter<InternalEntrepreneurData>): Promise<Cooperative.Documents.IGetResponse<ExternalEntrepreneurData>> {
+  async getMany(filter: Filter<InternalEntrepreneurData>): Promise<Cooperative.Document.IGetResponse<ExternalEntrepreneurData>> {
     const response = await this.data_service.getMany({ deleted: false, ...filter }, 'username')
     const entrepreneurs = response.results
     const blockFilter = filter.block_num ? { block_num: filter.block_num } : {}
@@ -83,7 +83,7 @@ export class Entrepreneur {
       entr.bank_account = (await (new PaymentMethod(this.db).getOne({ ...blockFilter, username: entr.username, method_type: 'bank_transfer', is_default: true })))?.data as IBankAccount
     }
 
-    const result: Cooperative.Documents.IGetResponse<ExternalEntrepreneurData> = {
+    const result: Cooperative.Document.IGetResponse<ExternalEntrepreneurData> = {
       results: entrepreneurs as ExternalEntrepreneurData[],
       page: response.page,
       limit: response.limit,

components/coopdoc-generator-ts/src/Models/Individual.ts

@@ -16,7 +16,7 @@ export class Individual {
 
   constructor(storage: MongoDBConnector, data?: ExternalIndividualData) {
     this.individual = data
-    this.data_service = new DataService<InternalIndividualData>(storage, 'IndividualData')
+    this.data_service = new DataService<InternalIndividualData>(storage, 'individuals')
   }
 
   validate(): ValidateResult {
@@ -44,7 +44,7 @@ export class Individual {
     return this.data_service.getOne(filter)
   }
 
-  async getMany(filter: Filter<InternalIndividualData>): Promise<Cooperative.Documents.IGetResponse<ExternalIndividualData>> {
+  async getMany(filter: Filter<InternalIndividualData>): Promise<Cooperative.Document.IGetResponse<ExternalIndividualData>> {
     return this.data_service.getMany(filter, 'username')
   }
 

components/coopdoc-generator-ts/src/Models/Organization.ts

@@ -24,7 +24,7 @@ export class Organization {
   constructor(storage: MongoDBConnector, data?: ExternalOrganizationData) {
     this.db = storage
     this.organization = data
-    this.data_service = new DataService<InternalOrganizationData>(storage, 'OrgData')
+    this.data_service = new DataService<InternalOrganizationData>(storage, 'organizations')
   }
 
   validate(): ValidateResult {
@@ -75,7 +75,7 @@ export class Organization {
     return org as ExternalOrganizationData
   }
 
-  async getMany(filter: Filter<InternalOrganizationData>): Promise<Cooperative.Documents.IGetResponse<ExternalOrganizationData>> {
+  async getMany(filter: Filter<InternalOrganizationData>): Promise<Cooperative.Document.IGetResponse<ExternalOrganizationData>> {
     const response = (await this.data_service.getMany({ deleted: false, ...filter }, 'username'))
     const orgs = response.results
     const blockFilter = filter.block_num ? { block_num: filter.block_num } : {}
@@ -84,7 +84,7 @@ export class Organization {
       org.bank_account = (await (new PaymentMethod(this.db).getOne({ ...blockFilter, username: org.username, method_type: 'bank_transfer', is_default: true })))?.data as IBankAccount
     }
 
-    const result: Cooperative.Documents.IGetResponse<ExternalOrganizationData> = {
+    const result: Cooperative.Document.IGetResponse<ExternalOrganizationData> = {
       results: orgs as ExternalOrganizationData[],
       page: response.page,
       limit: response.limit,

components/coopdoc-generator-ts/src/Models/PaymentMethod.ts

@@ -18,7 +18,7 @@ export class PaymentMethod {
   constructor(storage: MongoDBConnector, data?: PaymentData) {
     this.db = storage
     this.paymentMethod = data
-    this.data_service = new DataService(storage, 'PaymentData')
+    this.data_service = new DataService(storage, 'paymentMethods')
   }
 
   validate(): ValidateResult {
@@ -41,7 +41,7 @@ export class PaymentMethod {
     return this.data_service.getOne(filter)
   }
 
-  async getMany(filter: Filter<PaymentData>): Promise<Cooperative.Documents.IGetResponse<PaymentData>> {
+  async getMany(filter: Filter<PaymentData>): Promise<Cooperative.Document.IGetResponse<PaymentData>> {
     return this.data_service.getMany({ deleted: false, ...filter }, ['username', 'method_id'])
   }
 

components/coopdoc-generator-ts/src/Models/index.ts

@@ -2,3 +2,5 @@ export * from './Individual'
 export * from './Organization'
 export * from './Entrepreneur'
 export * from './Cooperative'
+export * from './Document'
+export * from './PaymentMethod'

components/coopdoc-generator-ts/src/Schema/DecisionSchema.ts

@@ -1,7 +1,7 @@
 import type { JSONSchemaType } from 'ajv'
-import type { IDecisionData } from '../Interfaces'
+import type { Cooperative } from 'cooptypes'
 
-export const decisionSchema: JSONSchemaType<IDecisionData> = {
+export const decisionSchema: JSONSchemaType<Cooperative.Document.IDecisionData> = {
   type: 'object',
   properties: {
     id: { type: 'number' },

components/coopdoc-generator-ts/src/Schema/MetaSchema.ts

@@ -0,0 +1,32 @@
+import type { JSONSchemaType } from 'ajv'
+import type { IMetaDocument } from '../Interfaces'
+
+export const IMetaJSONSchema: JSONSchemaType<IMetaDocument> = {
+  type: 'object',
+  properties: {
+    title: { type: 'string' },
+    registry_id: { type: 'number' },
+    lang: { type: 'string', enum: ['ru'] },
+    generator: { type: 'string' },
+    version: { type: 'string' },
+    coopname: { type: 'string' },
+    username: { type: 'string' },
+    created_at: { type: 'string' },
+    block_num: { type: 'number' },
+    timezone: { type: 'string' },
+    links: { type: 'array', items: { type: 'string' } },
+  },
+  required: [
+    'title',
+    'registry_id',
+    'lang',
+    'generator',
+    'version',
+    'coopname',
+    'username',
+    'created_at',
+    'block_num',
+    'timezone',
+  ],
+  additionalProperties: true,
+}

components/coopdoc-generator-ts/src/Services/Databazor/DataService.ts

@@ -25,7 +25,7 @@ class DataService<T extends IDocument> {
     groupByFields: string | string[],
     page: number = 1,
     limit: number = 100,
-  ): Promise<Cooperative.Documents.IGetResponse<T>> {
+  ): Promise<Cooperative.Document.IGetResponse<T>> {
     const groupFields = Array.isArray(groupByFields) ? groupByFields : [groupByFields]
     const groupId = groupFields.reduce((acc, field) => ({ ...acc, [field]: `$${field}` }), {})
 
@@ -55,7 +55,7 @@ class DataService<T extends IDocument> {
       { $limit: limit },
     ]).toArray()
 
-    const result: Cooperative.Documents.IGetResponse<T> = {
+    const result: Cooperative.Document.IGetResponse<T> = {
       results: results as T[],
       page,
       limit,

components/coopdoc-generator-ts/src/Services/Generator/index.ts

@@ -77,7 +77,7 @@ export class PDFService implements IPDFService {
     pdfDoc.setTitle(meta.title)
     pdfDoc.setLanguage(meta.lang)
     pdfDoc.setProducer(meta.version)
-    pdfDoc.setSubject(`документ для действия: ${meta.code}::${meta.action}`)
+    pdfDoc.setSubject(`Шаблона документа по реестру №${meta.registry_id}`)
     pdfDoc.setCreator(meta.generator)
     pdfDoc.setCreationDate(dateWithTimezone)
     pdfDoc.setModificationDate(dateWithTimezone)

components/coopdoc-generator-ts/src/Services/Templator/index.ts

@@ -25,7 +25,9 @@ class TransExtension {
     args.forEach((value, index) => {
       translation = translation.replace(new RegExp(`\\{${index}\\}`, 'g'), value)
     })
-    return translation
+    translation = translation.replace(/\n/g, '<br>')
+
+    return new nunjucks.runtime.SafeString(translation as unknown as string)
   }
 }
 

components/coopdoc-generator-ts/src/Services/Validator/index.ts

@@ -1,8 +1,6 @@
-import type { JSONSchemaType } from 'ajv'
 import Ajv from 'ajv'
 import addFormats from 'ajv-formats'
 import localize_ru from 'ajv-i18n/localize/ru'
-import type { IMetaDocument } from '../../Interfaces'
 
 const ajv = new Ajv()
 addFormats(ajv)
@@ -11,44 +9,12 @@ ajv.addFormat('phone', {
   type: 'string',
   validate: () => true,
 })
+
 // ajv.addFormat('phone', {
 //   type: 'string',
 //   validate: str => /^[+]?[(]?[0-9]{1,4}[)]?[-\\s\\.0-9]*$/.test(str),
 // })
 
-export const IMetaJSONSchema: JSONSchemaType<IMetaDocument> = {
-  type: 'object',
-  properties: {
-    code: { type: 'string' },
-    action: { type: 'string' },
-    title: { type: 'string' },
-    registry_id: { type: 'number' },
-    lang: { type: 'string', enum: ['ru'] },
-    generator: { type: 'string' },
-    version: { type: 'string' },
-    coopname: { type: 'string' },
-    username: { type: 'string' },
-    created_at: { type: 'string' },
-    block_num: { type: 'number' },
-    timezone: { type: 'string' },
-  },
-  required: [
-    'code',
-    'action',
-    'title',
-    'registry_id',
-    'lang',
-    'generator',
-    'version',
-    'coopname',
-    'username',
-    'created_at',
-    'block_num',
-    'timezone',
-  ],
-  additionalProperties: true,
-}
-
 export interface ValidateResult {
   valid: boolean
   error: string

components/coopdoc-generator-ts/src/Templates/100.ParticipantApplication.ts

@@ -1,120 +0,0 @@
-import type { JSONSchemaType } from 'ajv'
-
-import type { IMetaDocument, ITemplate } from '../Interfaces'
-import { IMetaJSONSchema } from '../Services/Validator'
-import { individualSchema } from '../Schema/IndividualSchema'
-import type { ExternalIndividualData, ExternalOrganizationData } from '../Models'
-import { organizationSchema } from '../Schema'
-import { type CooperativeData, CooperativeSchema } from '../Models/Cooperative'
-import type { ExternalEntrepreneurData } from '../Models/Entrepreneur'
-import { entrepreneurSchema } from '../Schema/EntrepreneurSchema'
-
-// Модель данных
-export interface IJoinCoopAction {
-  type: string
-  individual?: ExternalIndividualData
-  organization?: ExternalOrganizationData
-  entrepreneur?: ExternalEntrepreneurData
-  coop: CooperativeData
-  meta: IMetaDocument
-  signature: string
-}
-
-// Схема для сверки
-export const joinCoopJSONSchema: JSONSchemaType<IJoinCoopAction> = {
-  type: 'object',
-  properties: {
-    type: {
-      type: 'string',
-      enum: ['individual', 'entrepreneur', 'organization'],
-    },
-    individual: {
-      type: 'object',
-      properties: {
-        ...individualSchema.properties,
-      },
-      required: [...individualSchema.required],
-      additionalProperties: true,
-      nullable: true,
-    },
-    organization: {
-      type: 'object',
-      properties: {
-        ...organizationSchema.properties,
-      },
-      required: [...organizationSchema.required],
-      additionalProperties: true,
-      nullable: true,
-    },
-    entrepreneur: {
-      type: 'object',
-      properties: {
-        ...entrepreneurSchema.properties,
-      },
-      required: [...entrepreneurSchema.required],
-      additionalProperties: true,
-      nullable: true,
-    },
-    coop: {
-      type: 'object',
-      properties: {
-        ...CooperativeSchema.properties,
-      },
-      required: [...CooperativeSchema.required],
-      additionalProperties: true,
-    },
-    signature: {
-      type: 'string',
-    },
-    meta: {
-      type: 'object',
-      properties: {
-        ...IMetaJSONSchema.properties,
-      },
-      required: [...IMetaJSONSchema.required],
-      additionalProperties: true,
-    },
-  },
-  required: ['meta', 'coop', 'type', 'signature'],
-  additionalProperties: true,
-}
-
-export const ParticipantApplicationTemplate: ITemplate<IJoinCoopAction> = {
-  title: 'Заявление на вступление в кооператив',
-  description: 'Форма заявления на вступление в потребительский кооператив',
-  model: joinCoopJSONSchema,
-  context: `<style>\nh1 {\nmargin: 0px;\ntext-align:center;\n}\n</style>\n{% if type == 'individual' %}\n<h1 class=\"header\">{% trans 'application_individual' %}</h1>\n<p style=\"text-align: center\">{% trans 'in' %} {{ coop.full_name }}<p>\n<p style=\"text-align: right\">{{ meta.created_at }}, {{coop.city}}</p>\n<p>{% trans 'to_council_of' %} {{ coop.short_name }} {% trans 'from' %} {{ individual.last_name }} {{ individual.first_name }} {{ individual.middle_name }}, {% trans 'birthdate' %} {{ individual.birthdate }}, {% trans 'registration_address' %} {{ individual.full_address }}, {% trans 'phone_and_email_notice', individual.phone, individual.email %}</p>\n<p>{% trans 'request_to_join' %} {{ coop.full_name }}. {% trans 'acknowledge_documents_individual' %} {% if coop.is_branched %}</p> \n<p>{% trans 'authorize_chairman_branch', individual.branch_name %} {% endif %} </p>\n<p>{% trans 'obligation_to_pay_individual', coop.initial, coop.minimum %}</p>\n<p>{% trans 'agreement_on_sms_email_notice_individual' %}</p>\n<div class=\"signature\">\n<img style=\"max-width: 150px;\" src=\"{{ signature }}\"/>\n<p>{% trans 'signature' %} </p>\n<p style=\"text-align: right;\">{{ individual.last_name }} {{ individual.first_name }} {{ individual.middle_name }}</p>\n</div>\n\n{% elif type == 'entrepreneur' %}\n<h1 class=\"header\">{% trans 'application_entrepreneur' %}</h1>\n<p style=\"text-align: center\">{% trans 'in' %} {{ coop.full_name }}<p>\n<p style=\"text-align: right\">{{ meta.created_at }}, {{coop.city}}</p>  <p>{% trans 'to_council_of' %} {{ coop.short_name }} {% trans 'from_entrepreneur' %} {{ entrepreneur.last_name }} {{ entrepreneur.first_name }} {{ entrepreneur.middle_name }}, {% trans 'birthdate' %} {{ entrepreneur.birthdate }}, {% trans 'registration_address' %} {{ entrepreneur.full_address }}, {% trans 'entrepreneur_details', entrepreneur.details.inn, entrepreneur.details.ogrn, entrepreneur.bank_account.account_number, entrepreneur.bank_account.details.kpp, entrepreneur.bank_account.details.corr, entrepreneur.bank_account.details.bik, entrepreneur.bank_account.bank_name %}, {% trans 'phone_and_email_notice', entrepreneur.phone, entrepreneur.email %}</p>\n<p>{% trans 'request_to_join' %} {{ coop.full_name }}. {% trans 'acknowledge_documents_entrepreneur' %}</p> \n<p>{% if coop.is_branched %}{% trans 'authorize_chairman_branch', entrepreneur.branch_name %} {% endif %} </p>\n<p>{% trans 'obligation_to_pay_entrepreneur', coop.initial, coop.minimum %} </p>\n<p>{% trans 'agreement_on_sms_email_notice_entrepreneur' %}</p>\n<div class=\"signature\">\n<img style=\"max-width: 150px;\" src=\"{{ signature }}\"/>\n<p>{% trans 'signature' %} </p>\n<p style=\"text-align: right;\">{{ entrepreneur.last_name }} {{ entrepreneur.first_name }} {{ entrepreneur.middle_name }}</p>\n</div>\n\n{% elif type == 'organization' %}\n<h1 class=\"header\">{% trans 'application_legal_entity' %}</h1>\n<p style=\"text-align: center\">{% trans 'in' %} {{ coop.full_name }}<p>\n<p style=\"text-align: right\">{{ meta.created_at }}, {{coop.city}}</p>\n<p>{% trans 'to_council_of' %} «{{ coop.full_name }}» {% trans 'from_legal_entity' %} {{ organization.full_name }}, {% trans 'legal_address' %} {{ organization.full_address }}, {% trans 'legal_entity_details', organization.details.inn, organization.details.ogrn, organization.bank_account.account_number, organization.bank_account.details.kpp, organization.bank_account.details.corr, organization.bank_account.details.bik, organization.bank_account.bank_name %}, {% trans 'phone_and_email_notice', organization.phone, organization.email %}</p>\n<p>{% trans 'request_to_join_legal_entity', organization.represented_by.position, organization.represented_by.last_name, organization.represented_by.first_name, organization.represented_by.middle_name, organization.represented_by.based_on %} {{ coop.full_name }}.</p>\n<p>{% trans 'acknowledge_documents_legal_entity' %}</p> \n<p>{% if coop.is_branched %}{% trans 'authorize_chairman_branch_organization', organization.branch_name %} {% endif %}</p>\n<p>{% trans 'obligation_to_pay_legal_entity', coop.initial, coop.minimum %}</p>\n<p>{% trans 'agreement_on_sms_email_notice_legal_entity' %}</p>\n<div class=\"signature\">\n<img style=\"max-width: 150px;\" src=\"{{ signature }}\"/>\n<p>{% trans 'signature' %} </p>\n<p style=\"text-align: right;\">{{ organization.represented_by.last_name }} {{ organization.represented_by.first_name }} {{ organization.represented_by.middle_name }}</p>\n</div>\n\n{% endif %}\n\n`,
-  translations: {
-    ru: {
-      from: 'от',
-      application_individual: 'Заявление физического лица о приеме в пайщики',
-      to_council_of: 'В Совет',
-      birthdate: 'дата рождения',
-      registration_address: 'адрес регистрации (как в паспорте): ',
-      phone_and_email_notice: 'номер телефона с активированной функцией получения sms: {0}, адрес электронной почты: {1}.',
-      acknowledge_documents_individual: 'Подтверждаю, что с Уставом и иными нормативными документами Общества ознакомлен(а).',
-      agreement_on_sms_email_notice_individual: 'Выражаю свое согласие с тем, что информация, отправляемая Обществом в sms-сообщениях на указанный мной номер телефона, в сообщениях на указанный мной адрес электронной почты, или в PUSH уведомлениях с сайта, приравнивается к уведомлению меня Обществом в письменной форме.',
-      application_entrepreneur: 'Заявление индивидуального предпринимателя о приеме в пайщики',
-      from_entrepreneur: 'от индивидуального предпринимателя',
-      acknowledge_documents_entrepreneur: 'Подтверждаю, что с Уставом и иными нормативными документами Общества ознакомлен(а).',
-      agreement_on_sms_email_notice_entrepreneur: 'Выражаю свое согласие с тем, что информация, отправляемая Обществом в sms-сообщениях на указанный мной номер телефона, в сообщениях на указанный мной адрес электронной почты, или в PUSH уведомлениях с сайта, приравнивается к уведомлению меня Обществом в письменной форме.',
-      application_legal_entity: 'Заявление юридического лица о приеме в пайщики',
-      from_legal_entity: 'от юридического лица',
-      legal_address: 'юридический адрес организации',
-      legal_entity_details: 'ИНН {0}, ОГРН {1}, Р/с {2}, КПП {3}, К/с {4}, БИК {5}, банк получателя {6}',
-      acknowledge_documents_legal_entity: 'Подтверждает, что с Уставом и иными нормативными документами Общества ознакомлен.',
-      agreement_on_sms_email_notice_legal_entity: 'Выражает свое согласие с тем, что информация, отправляемая Обществом в sms-сообщениях на указанный номер телефона, в сообщениях на указанный адрес электронной почты, или в PUSH уведомлениях с сайта, приравнивается к уведомлению Заявителя Обществом в письменной форме.',
-      obligation_to_pay_individual: 'Обязуюсь своевременно внести в Общество вступительный {0} и минимальный паевой {1} взносы в порядке, предусмотренном Уставом Общества.',
-      obligation_to_pay_entrepreneur: 'Обязуюсь своевременно внести в Общество вступительный {0} и минимальный паевой {1} взносы в порядке, предусмотренном Уставом Общества.',
-      obligation_to_pay_legal_entity: 'Обязуется своевременно внести в Общество вступительный {0} и минимальный паевой {1} взносы в порядке, предусмотренном Уставом Общества.',
-      entrepreneur_details: 'ИНН {0}, ОГРНИП {1}, Р/с {2}, КПП {3}, К/с {4}, БИК {5}, банк получателя {6}',
-      authorize_chairman_branch: 'Уполномочиваю Председателя кооперативного участка {0} принимать участие с правом голоса в Общих собраниях уполномоченных Общества, на период моего членства в Обществе при указанном кооперативном участке.',
-      request_to_join_legal_entity: 'Заявитель, в лице представителя юридического лица - {0} {1} {2} {3}, действующий на основании {4}, просит принять в пайщики ',
-      authorize_chairman_branch_organization: 'Уполномочивает Председателя кооперативного участка {0} принимать участие с правом голоса в Общих собраниях уполномоченных Общества, на период моего членства в Обществе при указанном кооперативном участке.',
-      signature: 'подпись',
-      in: 'в',
-      request_to_join: 'Прошу принять меня в пайщики',
-    },
-    // ... другие переводы
-  },
-}

components/coopdoc-generator-ts/src/Templates/501.DecisionOfParticipantApplication.ts

@@ -1,123 +0,0 @@
-import type { JSONSchemaType } from 'ajv'
-
-import type { IDecisionData, IMetaDocument, ITemplate } from '../Interfaces'
-import { IMetaJSONSchema } from '../Services/Validator'
-import { individualSchema } from '../Schema/IndividualSchema'
-import { organizationSchema } from '../Schema'
-import { type CooperativeData, CooperativeSchema } from '../Models/Cooperative'
-import { entrepreneurSchema } from '../Schema/EntrepreneurSchema'
-import { decisionSchema } from '../Schema/DecisionSchema'
-import type { ExternalEntrepreneurData, ExternalIndividualData, ExternalOrganizationData } from '../Models'
-
-// Модель данных
-export interface IJoinCoopDecisionAction {
-  type: string
-  individual?: ExternalIndividualData
-  organization?: ExternalOrganizationData
-  entrepreneur?: ExternalEntrepreneurData
-  coop: CooperativeData
-  decision: IDecisionData
-  meta: IMetaDocument
-}
-
-// Схема для сверки
-export const joinCoopJSONSchema: JSONSchemaType<IJoinCoopDecisionAction> = {
-  type: 'object',
-  properties: {
-    type: {
-      type: 'string',
-      enum: ['individual', 'entrepreneur', 'organization'],
-    },
-    individual: {
-      type: 'object',
-      properties: {
-        ...individualSchema.properties,
-      },
-      required: [...individualSchema.required],
-      additionalProperties: true,
-      nullable: true,
-    },
-    organization: {
-      type: 'object',
-      properties: {
-        ...organizationSchema.properties,
-      },
-      required: [...organizationSchema.required],
-      additionalProperties: true,
-      nullable: true,
-    },
-    entrepreneur: {
-      type: 'object',
-      properties: {
-        ...entrepreneurSchema.properties,
-      },
-      required: [...entrepreneurSchema.required],
-      additionalProperties: true,
-      nullable: true,
-    },
-    coop: {
-      type: 'object',
-      properties: {
-        ...CooperativeSchema.properties,
-      },
-      required: [...CooperativeSchema.required],
-      additionalProperties: true,
-    },
-    decision: {
-      type: 'object',
-      properties: {
-        ...decisionSchema.properties,
-      },
-      required: [...decisionSchema.required],
-      additionalProperties: true,
-    },
-    meta: {
-      type: 'object',
-      properties: {
-        ...IMetaJSONSchema.properties,
-      },
-      required: [...IMetaJSONSchema.required],
-      additionalProperties: true,
-    },
-  },
-  required: ['meta', 'coop', 'type', 'decision'],
-  additionalProperties: true,
-}
-
-export const DecisionOfParticipantApplicationTemplate: ITemplate<IJoinCoopDecisionAction> = {
-  title: 'Решение совета о приёме пайщика в кооператив',
-  description: 'Форма решения совета о приёме пайщика в потребительский кооператив',
-  model: joinCoopJSONSchema,
-  context: `<style> \nh1 {\nmargin: 0px; \ntext-align:center;\n}\nh3{\nmargin: 0px;\npadding-top: 15px;\n}\n.about {\npadding: 20px;\n}\n.about p{\nmargin: 0px;\n}\n.signature {\npadding-top: 20px;\n}\n</style>\n\n<h1 class=\"header\">{% trans 'protocol_number', decision.id %}</h1>\n<p style=\"text-align:center\">{% trans 'council_meeting_name' %}\n{{ coop.full_name }}</p>\n<p style=\"text-align: right\"> {{ meta.created_at }}, {{ coop.city }}</p>\n\n<div class=\"about\">\n<p>{% trans 'meeting_format' %}</p>\n<p>{% trans 'meeting_place', coop.full_address %}</p>\n<p>{% trans 'meeting_date', decision.date %}</p>\n<p>{% trans 'opening_time', decision.time %}</p>\n</div>\n\n<h3>{% trans 'council_members' %}</h3>\n<ol>{% for member in coop.members %}\n<li>{{ member.last_name }} {{ member.first_name }} {{ member.middle_name }}{% if member.is_chairman %} {% trans 'chairman_of_the_council' %}{% endif %}</li>\n{% endfor %}\n</ol>\n\n<h3>{% trans 'meeting_legality' %} </h3>\n<p>{% trans 'voting_results', decision.voters_percent %} {% trans 'quorum' %} {% trans 'chairman_of_the_meeting', coop.chairman.last_name, coop.chairman.first_name, coop.chairman.middle_name %}.</p>\n\n<h3>{% trans 'agenda' %}</h3>\n<ol><li> {% trans 'decision_joincoop1' %}{% if type == 'individual' %} {{individual.last_name}} {{individual.first_name}} {{individual.middle.name}} ({{individual.birthdate}} {% trans 'birthdate' %}) {% endif %}{% if type == 'entrepreneur' %} {% trans 'entrepreneur' %} {{entrepreneur.last_name}} {{entrepreneur.first_name}} {{entrepreneur.middle.name}} ({% trans 'ogrnip' %} {{entrepreneur.details.ogrn}}) {% endif %}{% if type == 'organization' %} {{organization.short_name}} ({% trans 'ogrn' %} {{organization.details.ogrn}}) {% endif %}{% trans 'in_participants' %} {{ coop.short_name }}.\n</li></ol>\n\n<h3>{% trans 'voting' %}</h3>\n<p>{% trans 'vote_results', decision.votes_for, decision.votes_against, decision.votes_abstained %} </p>\n\n<h3>{% trans 'decision_made' %}</h3>\n<p>{% trans 'decision_joincoop2' %}{% if type == 'individual' %} {{individual.last_name}} {{individual.first_name}} {{individual.middle.name}} {{individual.birthdate}} {% trans 'birthdate' %}{% endif %} {% if type == 'entrepreneur' %}{% trans 'entrepreneur' %} {{entrepreneur.last_name}} {{entrepreneur.first_name}} {{entrepreneur.middle.name}}, {% trans 'ogrnip' %} {{entrepreneur.details.ogrn}}{% endif %} {% if type == 'organization' %} {{organization.short_name}}, {% trans 'ogrn' %} {{organization.details.ogrn}} {% endif %}</p>\n<hr>\n<p>{% trans 'closing_time', decision.time %}</p>\n\n<div class=\"signature\"> \n<p>{% trans 'signature' %}<p>\n<p style=\"text-align: right;\">{% trans 'chairman' %} {{ coop.chairman.last_name }} {{ coop.chairman.first_name }} {{ coop.chairman.middle_name }}</p></div>`,
-  translations: {
-    ru: {
-      meeting_format: 'Форма проведения собрания совета: заочная',
-      meeting_date: 'Дата проведения собрания совета: {0}',
-      meeting_place: 'Место проведения собрания совета: {0}',
-      opening_time: 'Время открытия собрания совета: {0}',
-      council_members: 'Члены Совета',
-      voting_results: 'Количество голосов составляет {0}% от общего числа членов Совета.',
-      meeting_legality: 'Собрание правомочно',
-      chairman_of_the_meeting: 'Председатель собрания совета: {0} {1} {2}',
-      agenda: 'Повестка дня',
-      vote_results: 'По первому вопросу повестки дня проголосовали: «За» – {0}; «Против» - {1}; «Воздержался» - {2}.',
-      decision_made: 'Решили',
-      closing_time: 'Время закрытия собрания совета: {0}.',
-      protocol_number: 'Протокол № {0}',
-      council_meeting_name: 'Собрания Совета',
-      chairman_of_the_council: '(председатель совета)',
-      signature: 'Документ подписан электронной подписью.',
-      chairman: 'Председатель',
-      birthdate: 'г.р.',
-      ogrnip: 'ОГРНИП',
-      entrepreneur: 'ИП',
-      ogrn: 'ОГРН',
-      quorum: 'Кворум для решения поставленных на повестку дня вопросов имеется.',
-      voting: 'Голосование',
-      in_participants: 'о приёме в пайщики',
-      decision_joincoop1: 'Рассмотреть заявление',
-      decision_joincoop2: 'Принять нового пайщика',
-    },
-    // ... другие переводы
-  },
-}

components/coopdoc-generator-ts/src/Templates/index.ts

@@ -1,2 +0,0 @@
-export * from './100.ParticipantApplication'
-export * from './registry'

components/coopdoc-generator-ts/src/Templates/registry.ts

@@ -1,11 +0,0 @@
-import * as ParticipantApplication from './100.ParticipantApplication'
-import * as DecisionOfParticipantApplication from './501.DecisionOfParticipantApplication'
-
-export const DocumentsRegistry = {
-  100: ParticipantApplication.ParticipantApplicationTemplate,
-  501: DecisionOfParticipantApplication.DecisionOfParticipantApplicationTemplate,
-}
-export interface DocumentsMappingByActionAndCode {
-  'registrator::joincoop': ParticipantApplication.IJoinCoopAction // Тип данных для документа 'registrator::joincoop'
-  'registrator::joincoopdec': DecisionOfParticipantApplication.IJoinCoopDecisionAction // Тип данных для документа 'registrator::joincoopdec'
-}

components/coopdoc-generator-ts/src/Utils/getDraftFromDeltas.ts

@@ -1,4 +1,4 @@
-import { DraftContract } from 'cooptypes/index'
+import { DraftContract } from 'cooptypes'
 import { getEnvVar } from '../config'
 import { getFetch } from './getFetch'
 

components/coopdoc-generator-ts/src/Utils/getTranslationFromDeltas.ts

@@ -1,4 +1,4 @@
-import { DraftContract } from 'cooptypes/index'
+import { DraftContract } from 'cooptypes'
 import { getEnvVar } from '../config'
 import { getFetch } from './getFetch'