chore: several agreements

Author: hmbanan666

apps/web-app/app/components/PartnerCard.vue

@@ -49,33 +49,35 @@
         {{ partner?.legal }}
       </p>
 
-      <p class="text-sm/4 text-muted line-clamp-3">
+      <p class="text-sm/4 text-muted line-clamp-4">
         {{ partner.city }}
       </p>
     </div>
   </ActiveCard>
 </template>
 
 <script setup lang="ts">
-import type { Partner, PartnerAgreement, PartnerLegalEntity } from '@roll-stack/database'
+import type { Partner } from '@roll-stack/database'
+import type { PartnerLegalEntityWithData } from '~/stores/partner'
 
 const { partner } = defineProps<{
   partner: Partner & {
-    legalEntity: PartnerLegalEntity | null
-    activeAgreement: PartnerAgreement | null
+    legalEntity: PartnerLegalEntityWithData | null
   }
 }>()
 
 const { imagesMode } = useApp()
 
+const minimalAgreement = computed(() => partner.legalEntity?.agreements.toSorted((a, b) => new Date(a.willEndAt ?? '').getTime() - new Date(b.willEndAt ?? '').getTime())[0])
+
 const agreementProgress = computed(() => {
-  if (!partner?.activeAgreement?.willEndAt || !partner?.activeAgreement?.concludedAt) {
+  if (!minimalAgreement.value?.willEndAt || !minimalAgreement.value?.concludedAt) {
     return 0
   }
 
   const now = new Date()
-  const concludedAt = new Date(partner.activeAgreement.concludedAt)
-  const willEndAt = new Date(partner.activeAgreement.willEndAt)
+  const concludedAt = new Date(minimalAgreement.value.concludedAt)
+  const willEndAt = new Date(minimalAgreement.value.willEndAt)
 
   const res = Math.floor(100 - ((now.getTime() - concludedAt.getTime()) / (willEndAt.getTime() - concludedAt.getTime())) * 100)
 

apps/web-app/app/components/form/UpdatePartnerAgreement.vue

@@ -28,6 +28,7 @@
       <UInputNumber
         v-model="state.marketingFee"
         orientation="vertical"
+        :step="0.1"
         size="xl"
         class="w-full items-center justify-center"
       />
@@ -87,8 +88,8 @@ const { t } = useI18n()
 const actionToast = useActionToast()
 
 const partnerStore = usePartnerStore()
-const partner = computed(() => partnerStore.partners.find((partner) => partner.activeAgreementId === agreementId))
-const agreement = computed(() => partner.value?.activeAgreement)
+const partner = computed(() => partnerStore.partners.find((partner) => partner.legalEntity?.agreements.some((agreement) => agreement.id === agreementId)))
+const agreement = computed(() => partner.value?.legalEntity?.agreements.find((agreement) => agreement.id === agreementId))
 
 const state = ref<Partial<UpdatePartnerAgreement>>({
   royalty: agreement.value?.royalty,

apps/web-app/app/pages/partner/[id].vue

@@ -23,23 +23,12 @@
 </template>
 
 <script setup lang="ts">
-import { format } from 'date-fns'
-import { ru } from 'date-fns/locale/ru'
-
 const { t } = useI18n()
 const { params } = useRoute('partner-id')
 
 const partnerStore = usePartnerStore()
 const partner = computed(() => partnerStore.partners.find((partner) => partner.id === params.id))
 
-const activeAgreementTo = computed(() => {
-  if (!partner.value?.activeAgreement?.willEndAt) {
-    return 'отсутствует'
-  }
-
-  return `до ${format(new Date(partner.value?.activeAgreement?.willEndAt), 'd MMMM yyyy', { locale: ru })}`
-})
-
 const submenuItems = computed(() => [
   {
     label: t('common.partner'),
@@ -54,10 +43,10 @@ const submenuItems = computed(() => [
     badge: partner.value?.kitchens.length,
   },
   {
-    label: 'Договор',
+    label: 'Договора',
     to: `/partner/${partner.value?.id}/agreement`,
     icon: 'i-lucide-scroll-text',
-    badge: activeAgreementTo.value,
+    badge: partner.value?.legalEntity?.agreements.length,
   },
   {
     label: 'Юр. лицо',

apps/web-app/app/pages/partner/[id]/agreement.vue

@@ -1,8 +1,12 @@
 <template>
   <Content>
     <div class="grid grid-cols-1 gap-4 md:gap-6 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
-      <div v-if="partner?.activeAgreement" class="lg:col-span-2">
-        <PartnerAgreementCard :agreement="partner.activeAgreement" />
+      <div
+        v-for="agreement in partner?.legalEntity?.agreements"
+        :key="agreement.id"
+        class="lg:col-span-2"
+      >
+        <PartnerAgreementCard :agreement="agreement" />
       </div>
 
       <div>

apps/web-app/app/pages/partner/[id]/index.vue

@@ -18,7 +18,7 @@
             {{ partner?.priceLevel }} уровень цен
           </p>
 
-          <p class="text-base">
+          <p class="text-base/5">
             {{ partner?.city }}
           </p>
         </div>
@@ -36,7 +36,7 @@
               Престиж
             </h3>
           </div>
-          <p class="text-muted leading-5">
+          <p class="text-base/5">
             Престиж не является статичным - он может как укрепляться, так и утрачиваться в зависимости от действий Партнера, его достижений и общественного восприятия.
           </p>
         </div>
@@ -46,8 +46,12 @@
         <PartnerLegalEntityCard :partner-id="partner?.id ?? ''" :entity="partner?.legalEntity" />
       </div>
 
-      <div v-if="partner?.activeAgreement" class="lg:col-span-2">
-        <PartnerAgreementCard :agreement="partner.activeAgreement" />
+      <div
+        v-for="agreement in partner?.legalEntity?.agreements"
+        :key="agreement.id"
+        class="lg:col-span-2"
+      >
+        <PartnerAgreementCard :agreement="agreement" />
       </div>
     </div>
   </Content>

apps/web-app/app/stores/partner.ts

@@ -1,9 +1,12 @@
 import type { Kitchen, Partner, PartnerAgreement, PartnerLegalEntity } from '@roll-stack/database'
 
+export type PartnerLegalEntityWithData = PartnerLegalEntity & {
+  agreements: PartnerAgreement[]
+}
+
 type PartnerWithData = Partner & {
   kitchens: Kitchen[]
-  legalEntity: PartnerLegalEntity | null
-  activeAgreement: PartnerAgreement | null
+  legalEntity: PartnerLegalEntityWithData | null
 }
 
 export const usePartnerStore = defineStore('partner', () => {

apps/web-app/server/api/partner/id/[partnerId]/agreement.post.ts

@@ -28,11 +28,6 @@ export default defineEventHandler(async (event) => {
       })
     }
 
-    // Update
-    await repository.partner.update(partnerId, {
-      activeAgreementId: agreement.id,
-    })
-
     return {
       ok: true,
       result: agreement,

packages/database/src/repository/partner.ts

@@ -30,8 +30,11 @@ export class Partner {
       where: (partners, { eq }) => eq(partners.isActive, true),
       with: {
         kitchens: true,
-        legalEntity: true,
-        activeAgreement: true,
+        legalEntity: {
+          with: {
+            agreements: true,
+          },
+        },
       },
     })
   }

packages/database/src/tables.ts

@@ -85,7 +85,6 @@ export const partners = pgTable('partners', {
   city: varchar('city'),
   legal: varchar('legal'),
   legalEntityId: cuid2('legal_entity_id').references(() => partnerLegalEntities.id),
-  activeAgreementId: cuid2('active_agreement_id').references(() => partnerAgreements.id),
 })
 
 export const partnerLegalEntities = pgTable('partner_legal_entities', {
@@ -573,10 +572,6 @@ export const partnerRelations = relations(partners, ({ many, one }) => ({
     fields: [partners.legalEntityId],
     references: [partnerLegalEntities.id],
   }),
-  activeAgreement: one(partnerAgreements, {
-    fields: [partners.activeAgreementId],
-    references: [partnerAgreements.id],
-  }),
 }))
 
 export const partnerLegalEntityRelations = relations(partnerLegalEntities, ({ many }) => ({