@coopenomics/desktop 2025.5.5 → 2025.5.13

package/src/features/Request/DisputeOnRequest/api/index.ts

@@ -5,34 +5,29 @@ import { ContractsList } from 'src/shared/config';
 import { useRequestStore } from 'src/entities/Request/model/stores';
 import { IUpdateOneRequest } from 'src/entities/Request';
 import { MarketContract } from 'cooptypes';
-import { IDocument } from 'src/shared/lib/types/document';
+import { fakeDocument } from 'src/shared/lib/document/model/const';
 
-async function dispute(
+async function disputeOnRequest(
   params: IDisputeOnRequest
 ): Promise<TransactResult | undefined> {
-  //TODO здесь нужно получить подписанный документ (заявление на взнос имуществом) и подставить
-  const document = {
-    hash: '33CBC662E606F23F332B442BAB84F2D05BD498B66EF61BC918740606B05BD565',
-    public_key: 'PUB_K1_8YWRWjCdUQubPoHzT5ndvfhGKDf1ZL7v7Ge9iHoLtNp7wnVfG1',
-    signature: 'SIG_K1_KWeGQ48n78ybpkuVDf1M7nuGnT8pkPXFbYYMUXtFTFv2dEReMEmwW89r19dKmAVSFZwHTdxdqkB3ZQJeAS9CcQwb92E398',
-    meta: '',
-  } as IDocument;
+  //TODO здесь нужно получить подписанный документ спора и подставить
+  const document = fakeDocument;
 
   const result = await transact({
-        account: ContractsList.Marketplace,
-        name: MarketContract.Actions.OpenDispute.actionName,
-        authorization: [
-          {
-            actor: params.username,
-            permission: 'active',
-          },
-        ],
-        data: {
-          username: params.username,
-          coopname: params.coopname,
-          exchange_id: params.request_id,
-          document,
-        } as MarketContract.Actions.OpenDispute.IOpenDispute,
+      account: ContractsList.Marketplace,
+      name: MarketContract.Actions.OpenDispute.actionName,
+      authorization: [
+        {
+          actor: params.username,
+          permission: 'active',
+        },
+      ],
+      data: {
+        username: params.username,
+        coopname: params.coopname,
+        exchange_id: params.request_id,
+        document: {...document, meta: JSON.stringify(document.meta)},
+      } as MarketContract.Actions.OpenDispute.IOpenDispute,
   });
 
   const requestsStore = useRequestStore();
@@ -45,5 +40,5 @@ async function dispute(
 }
 
 export const api = {
-  dispute,
+  disputeOnRequest,
 };

package/src/features/Request/DisputeOnRequest/ui/DisputeOnRequestButton.vue

@@ -23,7 +23,7 @@ q-btn(color="red" @click="dispute") вернуть по гарантии
 
   const dispute = async () => {
     try {
-      await api.dispute({
+      await api.disputeOnRequest({
         coopname: props.coopname,
         username: props.username,
         request_id: props.requestId,

package/src/features/Request/RecieveOnRequest/api/index.ts

@@ -4,19 +4,14 @@ import { transact } from 'src/shared/api';
 import { ContractsList } from 'src/shared/config';
 import { useRequestStore } from 'src/entities/Request/model/stores';
 import { IUpdateOneRequest } from 'src/entities/Request';
-import { IDocument } from 'src/shared/lib/types/document';
 import { MarketContract } from 'cooptypes';
+import { fakeDocument } from 'src/shared/lib/document/model/const';
 
-async function recieve(
+async function recieveOnRequest(
   params: IRecieveOnRequest
 ): Promise<TransactResult | undefined> {
-  //TODO здесь нужно получить подписанный документ (заявление на взнос имуществом) и подставить
-  const document = {
-    hash: '33CBC662E606F23F332B442BAB84F2D05BD498B66EF61BC918740606B05BD565',
-    public_key: 'PUB_K1_8YWRWjCdUQubPoHzT5ndvfhGKDf1ZL7v7Ge9iHoLtNp7wnVfG1',
-    signature: 'SIG_K1_KWeGQ48n78ybpkuVDf1M7nuGnT8pkPXFbYYMUXtFTFv2dEReMEmwW89r19dKmAVSFZwHTdxdqkB3ZQJeAS9CcQwb92E398',
-    meta: '',
-  } as IDocument;
+  //TODO здесь нужно получить подписанный документ (накладная) и подставить
+  const document = fakeDocument;
 
   const result = await transact({
       account: ContractsList.Marketplace,
@@ -31,7 +26,7 @@ async function recieve(
         username: params.username,
         coopname: params.coopname,
         exchange_id: params.request_id,
-        document,
+        document: {...document, meta: JSON.stringify(document.meta)},
       } as MarketContract.Actions.ReceiveOnRequest.IReceiveOnRequest,
   });
 
@@ -45,5 +40,5 @@ async function recieve(
 }
 
 export const api = {
-  recieve,
+  recieveOnRequest,
 };

package/src/features/Request/RecieveOnRequest/ui/RecieveOnRequestButton.vue

@@ -23,7 +23,7 @@ q-btn(color="green" @click="recieve") получил имущество
 
   const recieve = async () => {
     try {
-      await api.recieve({
+      await api.recieveOnRequest({
         coopname: props.coopname,
         username: props.username,
         request_id: props.requestId,

package/src/features/Request/SupplyOnRequest/api/index.ts

@@ -1,42 +1,33 @@
+import { TransactResult } from '@wharfkit/session';
 import { ISupplyOnRequest } from '../model';
 import { transact } from 'src/shared/api';
 import { ContractsList } from 'src/shared/config';
 import { useRequestStore } from 'src/entities/Request/model/stores';
 import { IUpdateOneRequest } from 'src/entities/Request';
 import { MarketContract } from 'cooptypes';
-import { IDocument } from 'src/shared/lib/types/document';
-import { TransactResult } from '@wharfkit/session';
+import { fakeDocument } from 'src/shared/lib/document/model/const';
 
 async function supplyOnRequest(
   params: ISupplyOnRequest
 ): Promise<TransactResult | undefined> {
-  //TODO получить подписанный акт приёма-передачи имущества
-  const document = {
-    hash: '33CBC662E606F23F332B442BAB84F2D05BD498B66EF61BC918740606B05BD565',
-    public_key: 'PUB_K1_8YWRWjCdUQubPoHzT5ndvfhGKDf1ZL7v7Ge9iHoLtNp7wnVfG1',
-    signature: 'SIG_K1_KWeGQ48n78ybpkuVDf1M7nuGnT8pkPXFbYYMUXtFTFv2dEReMEmwW89r19dKmAVSFZwHTdxdqkB3ZQJeAS9CcQwb92E398',
-    meta: '',
-  } as IDocument;
+  //TODO здесь нужно получить подписанный документ (накладная) и подставить
+  const document = fakeDocument;
 
   const result = await transact({
-    actions: [
-      {
-        account: ContractsList.Marketplace,
-        name: MarketContract.Actions.SupplyOnRequest.actionName,
-        authorization: [
-          {
-            actor: params.username,
-            permission: 'active',
-          },
-        ],
-        data: {
-          username: params.username,
-          coopname: params.coopname,
-          exchange_id: params.request_id,
-          document,
-        } as MarketContract.Actions.SupplyOnRequest.ISupplyOnRequest,
-      },
-    ],
+      account: ContractsList.Marketplace,
+      name: MarketContract.Actions.SupplyOnRequest.actionName,
+      authorization: [
+        {
+          actor: params.username,
+          permission: 'active',
+        },
+      ],
+      data: {
+        username: params.username,
+        coopname: params.coopname,
+        exchange_id: params.request_id,
+        document: {...document, meta: JSON.stringify(document.meta)},
+      } as MarketContract.Actions.SupplyOnRequest.ISupplyOnRequest,
   });
 
   const requestsStore = useRequestStore();

package/src/features/Union/AddCooperative/ui/AddCooperativeForm.vue

@@ -28,7 +28,7 @@ import { notEmpty, isDomain } from 'src/shared/lib/utils';
 import { useSessionStore } from 'src/entities/Session';
 import { RegistratorContract } from 'cooptypes';
 import { FailAlert, SuccessAlert } from 'src/shared/api';
-import type { IObjectedDocument } from 'src/shared/lib/types/document';
+import type { IDocument } from 'src/shared/lib/types/document';
 import { env } from 'src/shared/config';
 
 const emit = defineEmits(['finish'])
@@ -39,7 +39,7 @@ const isSubmitting = ref(false)
 
 const props = defineProps({
   document: {
-    type: Object as () => IObjectedDocument,
+    type: Object as () => IDocument,
     required: true,
   }
 })
@@ -62,10 +62,12 @@ const data = ref<RegistratorContract.Actions.RegisterCooperative.IRegisterCooper
   },
   username: session.username,
   document: {
+    version: '1.0.0',
     hash: '',
-    public_key: '',
-    signature: '',
-    meta: ''
+    doc_hash: '',
+    meta_hash: '',
+    meta: '',
+    signatures: []
   }
 })
 

package/src/features/User/CreateUser/api/index.ts

@@ -1,21 +1,39 @@
 import { PrivateKey } from '@wharfkit/antelope';
 import {
-  ICreatedUser,
-  IKeyPair,
-  ISendStatement,
+  IKeyPair
 } from 'src/shared/lib/types/user';
 import { sendPOST } from 'src/shared/api';
-import { ICreateUser } from '../model';
 import type { ICreatedPayment } from '@coopenomics/controller';
+import { Mutations } from '@coopenomics/sdk';
+import { client } from 'src/shared/api/client';
+import type { IRegisterAccount, IRegisteredAccountResult } from 'src/shared/lib/types/user/IUserData';
+import type { ISendStatement, ISendStatementResult } from '../model';
 
-async function createUser(data: ICreateUser): Promise<ICreatedUser> {
-  const response = await sendPOST('/v1/users', data, true);
-
-  return response;
+async function createUser(data: IRegisterAccount): Promise<IRegisteredAccountResult> {
+  const { [Mutations.Accounts.RegisterAccount.name]: result } = await client.Mutation(
+    Mutations.Accounts.RegisterAccount.mutation,
+    {
+      variables: {
+        data
+      }
+    }
+  );
+  console.log('result: ', result, data);
+  return result;
 }
 
-async function sendStatement(data: ISendStatement): Promise<void> {
-  await sendPOST('/v1/participants/join-cooperative', data);
+async function sendStatement(data: ISendStatement): Promise<ISendStatementResult> {
+  console.log('send statement: ', data);
+  const { [Mutations.Participants.RegisterParticipant.name]: result } = await client.Mutation(
+    Mutations.Participants.RegisterParticipant.mutation,
+    {
+      variables: {
+        data
+      }
+    }
+  );
+
+  return result;
 }
 
 async function emailIsExist(email: string): Promise<boolean> {

package/src/features/User/CreateUser/model/index.ts

@@ -2,13 +2,12 @@ import { api } from '../api';
 import emailRegex from 'email-regex';
 const emailValidator = emailRegex({ exact: true });
 
-import { IGeneratedAccount, ISendStatement } from 'src/shared/lib/types/user';
+import { IGeneratedAccount } from 'src/shared/lib/types/user';
 
 import { useSessionStore } from 'src/entities/Session';
 import { useGlobalStore } from 'src/shared/store';
 import { useSystemStore } from 'src/entities/System/model';
 
-import { IObjectedDocument } from 'src/shared/lib/types/document';
 import {
   ICreatedPayment,
 } from 'src/shared/lib/types/payments';
@@ -16,10 +15,11 @@ import {
   useCurrentUserStore,
 } from 'src/entities/User';
 import { useRegistratorStore } from 'src/entities/Registrator'
-import { IEntrepreneurData, IIndividualData, IOrganizationData, IUserData } from 'src/shared/lib/types/user/IUserData';
+import { IEntrepreneurData, IIndividualData, IOrganizationData, IUserData, type IRegisterAccount } from 'src/shared/lib/types/user/IUserData';
 import { client } from 'src/shared/api/client';
-import { Mutations } from '@coopenomics/sdk';
-
+import { Mutations, Zeus } from '@coopenomics/sdk';
+import { DigitalDocument } from 'src/shared/lib/document';
+import { IDocument } from 'src/shared/lib/types/document';
 export interface ICreateUser {
   email: string;
   entrepreneur_data?: IEntrepreneurData;
@@ -32,6 +32,11 @@ export interface ICreateUser {
   username: string;
 }
 
+
+export type ISendStatement = Mutations.Participants.RegisterParticipant.IInput['data'];
+export type ISendStatementResult = Mutations.Participants.RegisterParticipant.IOutput[typeof Mutations.Participants.RegisterParticipant.name];
+
+
 export function useCreateUser() {
   const store = useRegistratorStore().state
   const { info } = useSystemStore()
@@ -46,6 +51,7 @@ export function useCreateUser() {
   async function sendStatementAndAgreements(): Promise<void> {
     const data: ISendStatement = {
       username: store.account.username,
+      braname: store.selectedBranch,
       statement: store.statement,
       wallet_agreement: store.walletAgreement,
       privacy_agreement: store.privacyAgreement,
@@ -57,7 +63,7 @@ export function useCreateUser() {
   }
 
 
-  async function signStatement(): Promise<IObjectedDocument> {
+  async function signStatement(): Promise<IDocument> {
     const variables: Mutations.Participants.GenerateParticipantApplication.IInput = {
       data: {
         signature: store.signature,
@@ -65,7 +71,7 @@ export function useCreateUser() {
         coopname: info.coopname,
         username: store.account.username,
         braname: store.selectedBranch,
-        links: [store.walletAgreement.hash, store.privacyAgreement.hash, store.signatureAgreement.hash, store.userAgreement.hash]
+        links: [store.walletAgreement.doc_hash, store.privacyAgreement.doc_hash, store.signatureAgreement.doc_hash, store.userAgreement.doc_hash]
       }
     }
 
@@ -74,12 +80,13 @@ export function useCreateUser() {
       { variables }
     );
 
-    store.statement = await client.Document.signDocument(result)
+    const digitalDocument = new DigitalDocument(result);
+    store.statement = await digitalDocument.sign(store.account.username);
 
     return store.statement;
   }
 
-  async function signPrivacyAgreement(): Promise<IObjectedDocument> {
+  async function signPrivacyAgreement(): Promise<IDocument> {
     const variables: Mutations.Agreements.GeneratePrivacyAgreement.IInput = {
       data: {
         coopname: info.coopname,
@@ -92,12 +99,13 @@ export function useCreateUser() {
       { variables }
     );
 
-    store.privacyAgreement = await client.Document.signDocument(result)
+    const digitalDocument = new DigitalDocument(result);
+    store.privacyAgreement = await digitalDocument.sign(store.account.username);
 
     return store.privacyAgreement;
   }
 
-  async function signSignatureAgreement(): Promise<IObjectedDocument> {
+  async function signSignatureAgreement(): Promise<IDocument> {
     const variables: Mutations.Agreements.GenerateSignatureAgreement.IInput = {
       data: {
         coopname: info.coopname,
@@ -110,14 +118,14 @@ export function useCreateUser() {
       { variables }
     );
 
-    store.signatureAgreement = await client.Document.signDocument(result)
+    const digitalDocument = new DigitalDocument(result);
+    store.signatureAgreement = await digitalDocument.sign(store.account.username);
 
     return store.signatureAgreement;
-
   }
 
 
-  async function signUserAgreement(): Promise<IObjectedDocument> {
+  async function signUserAgreement(): Promise<IDocument> {
     const variables: Mutations.Agreements.GenerateUserAgreement.IInput = {
       data: {
         coopname: info.coopname,
@@ -130,16 +138,16 @@ export function useCreateUser() {
       { variables }
     );
 
-    store.userAgreement = await client.Document.signDocument(result)
+    const digitalDocument = new DigitalDocument(result);
+    store.userAgreement = await digitalDocument.sign(store.account.username);
 
     return store.userAgreement;
-
   }
 
 
 
 
-  async function signWalletAgreement(): Promise<IObjectedDocument> {
+  async function signWalletAgreement(): Promise<IDocument> {
     const variables: Mutations.Agreements.GenerateWalletAgreement.IInput = {
       data: {
         coopname: info.coopname,
@@ -152,7 +160,8 @@ export function useCreateUser() {
       { variables }
     );
 
-    store.walletAgreement = await client.Document.signDocument(result)
+    const digitalDocument = new DigitalDocument(result);
+    store.walletAgreement = await digitalDocument.sign(store.account.username);
 
     return store.walletAgreement;
   }
@@ -175,44 +184,43 @@ export function useCreateUser() {
     );
 
     return result;
-
   }
 
   async function createUser(
     email: string,
     userData: IUserData,
-    account: IGeneratedAccount
+    generatedAccount: IGeneratedAccount
   ): Promise<void> {
 
     const synthData = { type: userData.type } as any;
 
-    if (synthData.type === 'individual') {
+    if (synthData.type === Zeus.AccountType.individual) {
       synthData.individual_data = userData.individual_data;
-    } else if (synthData.type === 'organization') {
+    } else if (synthData.type === Zeus.AccountType.organization) {
       synthData.organization_data = userData.organization_data;
-    } else if (synthData.type === 'entrepreneur') {
+    } else if (synthData.type === Zeus.AccountType.entrepreneur) {
       synthData.entrepreneur_data = userData.entrepreneur_data;
     }
-    const data: ICreateUser = {
+    console.log('synthData: ', synthData);
+    const data: IRegisterAccount = {
       ...synthData,
-      role: 'user',
       email,
-      username: account.username,
-      public_key: account.public_key,
+      username: generatedAccount.username,
+      public_key: generatedAccount.public_key,
     };
-
-    const { user, tokens } = await api.createUser(data);
+    console.log('data: ', data);
+    const { account, tokens } = await api.createUser(data);
 
     const globalStore = useGlobalStore();
     const sessionStore = useSessionStore();
 
     await globalStore.setTokens(tokens);
-    await globalStore.setWif(user.username, account.private_key);
+    await globalStore.setWif(account.username, generatedAccount.private_key);
 
     await sessionStore.init();
 
     const currentUser = useCurrentUserStore();
-    await currentUser.loadProfile(user.username, info.coopname);
+    await currentUser.loadProfile(account.username, info.coopname);
   }
 
   function emailIsValid(email: string): boolean {

package/src/pages/Cooperative/ListOfAgenda/ui/ListOfAgendaQuestions.vue

@@ -69,18 +69,18 @@ const onAuthorizeDecision = async (row) => {
   }
 }
 
-const onVoteFor = async (decision_id) => {
-  processingDecisions.value[decision_id] = true
+const onVoteFor = async (row) => {
+  processingDecisions.value[row.table.id] = true
 
   try {
-    await voteForDecision(decision_id)
+    await voteForDecision(row)
     SuccessAlert('Голос принят')
     await loadDecisions(route.params.coopname as string)
   } catch (e) {
     FailAlert(e)
   } finally {
     // Гарантированно сбрасываем состояние загрузки
-    processingDecisions.value[decision_id] = false
+    processingDecisions.value[row.table.id] = false
 
     // Добавляем таймаут для гарантии обновления UI
     setTimeout(() => {
@@ -89,18 +89,18 @@ const onVoteFor = async (decision_id) => {
   }
 }
 
-const onVoteAgainst = async (decision_id) => {
-  processingDecisions.value[decision_id] = true
+const onVoteAgainst = async (row) => {
+  processingDecisions.value[row.table.id] = true
 
   try {
-    await voteAgainstDecision(decision_id)
+    await voteAgainstDecision(row)
     SuccessAlert('Голос принят')
     await loadDecisions(route.params.coopname as string)
   } catch (e) {
     FailAlert(e)
   } finally {
     // Гарантированно сбрасываем состояние загрузки
-    processingDecisions.value[decision_id] = false
+    processingDecisions.value[row.table.id] = false
 
     // Добавляем таймаут для гарантии обновления UI
     setTimeout(() => {

package/src/pages/Cooperative/ListOfParticipants/ui/ListOfParticipantsPage.vue

@@ -48,16 +48,16 @@ loadParticipants()
 
 const update = (account: IAccount, newData: IIndividualData | IOrganizationData | IEntrepreneurData) => {
   switch (account.private_account?.type) {
-    case AccountTypes.Individual:
+    case AccountTypes.individual:
       account.private_account.individual_data = {
         ...newData as IIndividualData,
         passport: (newData as IIndividualData).passport ?? undefined
       }
       break
-    case AccountTypes.Entrepreneur:
+    case AccountTypes.entrepreneur:
       account.private_account.entrepreneur_data = newData as IEntrepreneurData
       break
-    case AccountTypes.Organization:
+    case AccountTypes.organization:
       account.private_account.organization_data = newData as IOrganizationData
       break
   }

package/src/pages/Registrator/SignUp/EmailInput.vue

@@ -62,13 +62,6 @@ watch(email, checkEmailExists)
 const setEmail = () => {
   if (isValidEmail.value && !isEmailExist.value) {
     store.state.email = email.value
-    if (store.state.userData.individual_data)
-      store.state.userData.individual_data.email = email.value
-    if (store.state.userData.organization_data)
-      store.state.userData.organization_data.email = email.value
-    if (store.state.userData.entrepreneur_data)
-      store.state.userData.entrepreneur_data.email = email.value
-
     store.next();
   }
 }

package/src/pages/Union/ConnectionAgreement/ConnectionAgreementPage.vue

@@ -93,7 +93,7 @@ const init = async () => {
 }
 
 const sign = async() => {
-  await document.value.sign()
+  await document.value.sign(session.username)
 }
 
 init()