Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions apps/web-app/app/components/PartnerAgreementCard.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
<template>
<UCard class="h-full" @click="modalUpdatePartnerAgreement.open({ agreementId: agreement.id })">
<UCard
class="h-full"
:class="[
!agreement.isActive && 'opacity-75 grayscale-100',
]"
>
<div class="flex flex-col gap-3">
<div class="flex flex-row items-start gap-3.5">
<UIcon name="i-lucide-scroll-text" class="shrink-0 size-16 text-secondary" />
<UIcon
name="i-lucide-scroll-text"
class="shrink-0 size-16 text-secondary"
@click="modalUpdatePartnerAgreement.open({ agreementId: agreement.id })"
/>

<UProgress
v-model="agreementProgress"
Expand Down Expand Up @@ -39,17 +48,33 @@
<p class="text-muted">
{{ agreement.comment }}
</p>

<div class="flex flex-col gap-1.5">
<UButton
v-for="file in agreement.files"
:key="file.id"
:to="file.url"
external
target="_blank"
size="lg"
variant="subtle"
color="neutral"
icon="i-lucide-file-symlink"
>
{{ file.name }}
</UButton>
</div>
</div>
</UCard>
</template>

<script setup lang="ts">
import type { PartnerAgreement } from '@roll-stack/database'
import type { PartnerAgreement, PartnerAgreementFile } from '@roll-stack/database'
import { ModalUpdatePartnerAgreement } from '#components'
import { format } from 'date-fns'
import { ru } from 'date-fns/locale/ru'

const { agreement } = defineProps<{ agreement: PartnerAgreement }>()
const { agreement } = defineProps<{ agreement: PartnerAgreement & { files: PartnerAgreementFile[] } }>()

const overlay = useOverlay()
const modalUpdatePartnerAgreement = overlay.create(ModalUpdatePartnerAgreement)
Expand Down
2 changes: 1 addition & 1 deletion apps/web-app/app/components/PartnerCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const { partner } = defineProps<{

const { imagesMode } = useApp()

const minimalAgreement = computed(() => partner.legalEntity?.agreements.toSorted((a, b) => new Date(a.willEndAt ?? '').getTime() - new Date(b.willEndAt ?? '').getTime())[0])
const minimalAgreement = computed(() => partner.legalEntity?.agreements.filter((agreement) => agreement.isActive).toSorted((a, b) => new Date(a.willEndAt ?? '').getTime() - new Date(b.willEndAt ?? '').getTime())[0])

const agreementProgress = computed(() => {
if (!minimalAgreement.value?.willEndAt || !minimalAgreement.value?.concludedAt) {
Expand Down
8 changes: 6 additions & 2 deletions apps/web-app/app/stores/partner.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import type { Kitchen, Partner, PartnerAgreement, PartnerLegalEntity } from '@roll-stack/database'
import type { Kitchen, Partner, PartnerAgreement, PartnerAgreementFile, PartnerLegalEntity } from '@roll-stack/database'

type PartnerAgreementWithData = PartnerAgreement & {
files: PartnerAgreementFile[]
}

export type PartnerLegalEntityWithData = PartnerLegalEntity & {
agreements: PartnerAgreement[]
agreements: PartnerAgreementWithData[]
}

type PartnerWithData = Partner & {
Expand Down
6 changes: 5 additions & 1 deletion packages/database/src/repository/partner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ export class Partner {
kitchens: true,
legalEntity: {
with: {
agreements: true,
agreements: {
with: {
files: true,
},
},
},
},
},
Expand Down
18 changes: 18 additions & 0 deletions packages/database/src/tables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ export const partnerAgreements = pgTable('partner_agreements', {
updatedAt: timestamp('updated_at', { precision: 3, withTimezone: true, mode: 'string' }).notNull().defaultNow(),
concludedAt: timestamp('concluded_at', { precision: 3, withTimezone: true, mode: 'string' }),
willEndAt: timestamp('will_end_at', { precision: 3, withTimezone: true, mode: 'string' }),
isActive: boolean('is_active').notNull().default(true),
internalId: varchar('internal_id').notNull(),
royalty: numeric('royalty', { mode: 'number' }).notNull().default(0),
minRoyaltyPerMonth: numeric('min_royalty_per_month', { mode: 'number' }).notNull().default(0),
Expand All @@ -113,6 +114,15 @@ export const partnerAgreements = pgTable('partner_agreements', {
legalEntityId: cuid2('legal_entity_id').references(() => partnerLegalEntities.id),
})

export const partnerAgreementFiles = pgTable('partner_agreement_files', {
id: cuid2('id').defaultRandom().primaryKey(),
createdAt: timestamp('created_at', { precision: 3, withTimezone: true, mode: 'string' }).notNull().defaultNow(),
updatedAt: timestamp('updated_at', { precision: 3, withTimezone: true, mode: 'string' }).notNull().defaultNow(),
name: varchar('name').notNull(),
url: varchar('url').notNull(),
agreementId: cuid2('agreement_id').notNull().references(() => partnerAgreements.id),
})

export const chats = pgTable('chats', {
id: cuid2('id').defaultRandom().primaryKey(),
createdAt: timestamp('created_at', { precision: 3, withTimezone: true, mode: 'string' }).notNull().defaultNow(),
Expand Down Expand Up @@ -585,6 +595,14 @@ export const partnerAgreementRelations = relations(partnerAgreements, ({ one, ma
references: [partnerLegalEntities.id],
}),
partners: many(partners),
files: many(partnerAgreementFiles),
}))

export const partnerAgreementFileRelations = relations(partnerAgreementFiles, ({ one }) => ({
agreement: one(partnerAgreements, {
fields: [partnerAgreementFiles.agreementId],
references: [partnerAgreements.id],
}),
}))

export const chatRelations = relations(chats, ({ many, one }) => ({
Expand Down
3 changes: 3 additions & 0 deletions packages/database/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ export type PartnerLegalEntityDraft = InferInsertModel<typeof tables.partnerLega
export type PartnerAgreement = InferSelectModel<typeof tables.partnerAgreements>
export type PartnerAgreementDraft = InferInsertModel<typeof tables.partnerAgreements>

export type PartnerAgreementFile = InferSelectModel<typeof tables.partnerAgreementFiles>
export type PartnerAgreementFileDraft = InferInsertModel<typeof tables.partnerAgreementFiles>

export type Chat = InferSelectModel<typeof tables.chats>
export type ChatDraft = InferInsertModel<typeof tables.chats>

Expand Down