From dcf127bd57a7869e0e3fb3de2ab8d25778faf316 Mon Sep 17 00:00:00 2001
From: "i.seliverstov" <i.seliverstov@mtlab.space>
Date: Sun, 16 Aug 2026 09:45:56 +0500
Subject: [PATCH] feat(goals): complete with success or failure outcome

---
 alfy-bot-frontend/src/api/goals.ts            |  1 +
 alfy-bot-frontend/src/components/GoalCard.vue |  2 +-
 .../src/components/GoalStatusBadge.vue        | 20 +++--
 alfy-bot-frontend/src/types/index.ts          |  2 +
 alfy-bot-frontend/src/views/GoalView.vue      | 81 ++++++++++++++++++-
 .../tests/views/GoalView.spec.ts              | 66 +++++++++++++++
 .../modules/bot/scenes/list-goals.scene.ts    |  5 ++
 .../src/modules/goal/dto/goal-response.dto.ts | 10 ++-
 .../src/modules/goal/dto/update-goal.dto.ts   | 10 +++
 .../src/modules/goal/goal.controller.spec.ts  | 31 +++++++
 alfy-bot/src/modules/goal/goal.controller.ts  |  6 ++
 alfy-bot/src/shared/entities/goal.entity.ts   |  4 +
 12 files changed, 226 insertions(+), 12 deletions(-)

diff --git a/alfy-bot-frontend/src/api/goals.ts b/alfy-bot-frontend/src/api/goals.ts
index bc283f5..beb347c 100644
--- a/alfy-bot-frontend/src/api/goals.ts
+++ b/alfy-bot-frontend/src/api/goals.ts
@@ -27,6 +27,7 @@ export interface QuestionWithScheduleItem {
 
 export interface UpdateGoalDto {
   status?: 'active' | 'completed' | 'archived' | 'deleted'
+  outcome?: 'success' | 'failure' | null
   goal_name?: string
   parent_goal_id?: number | null
 }
diff --git a/alfy-bot-frontend/src/components/GoalCard.vue b/alfy-bot-frontend/src/components/GoalCard.vue
index 850ddc5..8d260e1 100644
--- a/alfy-bot-frontend/src/components/GoalCard.vue
+++ b/alfy-bot-frontend/src/components/GoalCard.vue
@@ -50,7 +50,7 @@ function subGoalsLabel(n: number) {
 
       <!-- status + global badge -->
       <div class="mb-3 flex items-center gap-2">
-        <GoalStatusBadge :status="goal.status" />
+        <GoalStatusBadge :status="goal.status" :outcome="goal.outcome" />
         <span
           v-if="goal.is_global"
           class="inline-flex items-center gap-1 rounded-full border border-border bg-muted px-2 py-0.5 text-xs font-medium text-muted-foreground"
diff --git a/alfy-bot-frontend/src/components/GoalStatusBadge.vue b/alfy-bot-frontend/src/components/GoalStatusBadge.vue
index c0b0d16..cfdf40e 100644
--- a/alfy-bot-frontend/src/components/GoalStatusBadge.vue
+++ b/alfy-bot-frontend/src/components/GoalStatusBadge.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import type { GoalStatus } from '../types'
+import type { GoalOutcome, GoalStatus } from '../types'
 
-const props = defineProps<{ status: GoalStatus }>()
+const props = defineProps<{ status: GoalStatus, outcome?: GoalOutcome | null }>()
 
 const config: Record<GoalStatus, { label: string, classes: string, dot: string }> = {
   active: {
@@ -10,9 +10,9 @@ const config: Record<GoalStatus, { label: string, classes: string, dot: string }
     dot: 'bg-green-500',
   },
   completed: {
-    label: 'Завершена',
-    classes: 'text-gray-500 dark:text-gray-400',
-    dot: 'bg-gray-400',
+    label: 'Достигнута',
+    classes: 'text-emerald-700 dark:text-emerald-400',
+    dot: 'bg-emerald-500',
   },
   archived: {
     label: 'В архиве',
@@ -26,7 +26,15 @@ const config: Record<GoalStatus, { label: string, classes: string, dot: string }
   },
 }
 
-const cfg = config[props.status]
+const failed = {
+  label: 'Неудача',
+  classes: 'text-rose-700 dark:text-rose-400',
+  dot: 'bg-rose-500',
+}
+
+const cfg = props.status === 'completed' && props.outcome === 'failure'
+  ? failed
+  : config[props.status]
 </script>
 
 <template>
diff --git a/alfy-bot-frontend/src/types/index.ts b/alfy-bot-frontend/src/types/index.ts
index ee2dccb..727c4b8 100644
--- a/alfy-bot-frontend/src/types/index.ts
+++ b/alfy-bot-frontend/src/types/index.ts
@@ -1,4 +1,5 @@
 export type GoalStatus = 'active' | 'completed' | 'archived' | 'deleted'
+export type GoalOutcome = 'success' | 'failure'
 export type GoalType = 'SIMPLE' | 'SMART' | 'GLOBAL'
 export type QuestionType = 'number' | 'text' | 'rating' | 'emoji_rating' | 'yes_no' | 'time_spent' | 'photo'
 export type FrequencyType = 'daily' | 'weekly_days' | 'interval'
@@ -50,6 +51,7 @@ export interface Goal {
   goal_start: string | null
   goal_end: string | null
   status: GoalStatus
+  outcome?: GoalOutcome | null
   createdAt: string
   is_global: boolean
   parent_goal_id: number | null
diff --git a/alfy-bot-frontend/src/views/GoalView.vue b/alfy-bot-frontend/src/views/GoalView.vue
index 8716df0..7f3fde1 100644
--- a/alfy-bot-frontend/src/views/GoalView.vue
+++ b/alfy-bot-frontend/src/views/GoalView.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { QuestionWithScheduleItem } from '../api/goals'
 import type { GoalReportStatus } from '../api/reports'
-import type { Goal, Question } from '../types'
-import { Archive, Check, ChevronRight, MoreVertical, MoveUpRight, Pencil, Plus, RotateCcw, Trash2, Unlink } from 'lucide-vue-next'
+import type { Goal, GoalOutcome, Question } from '../types'
+import { Archive, Check, CheckCircle2, ChevronRight, Flag, MoreVertical, MoveUpRight, Pencil, Plus, RotateCcw, Trash2, Unlink, XCircle } from 'lucide-vue-next'
 import { computed, onMounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import PageContainer from '@/components/PageContainer.vue'
@@ -86,6 +86,7 @@ let pendingTypeChangeSnapshot: { value: QuestionWithScheduleItem, count: number
 type GoalAction = 'archive' | 'delete' | 'restore'
 const goalActionPending = ref<GoalAction | null>(null)
 let pendingGoalAction: GoalAction | null = null
+const completeOpen = ref(false)
 
 // Родительская global-цель (если текущая цель привязана к ней).
 const parentGoal = ref<Goal | null>(null)
@@ -447,6 +448,24 @@ function onCancelGoalAction() {
   pendingGoalAction = null
   goalActionPending.value = null
 }
+
+async function completeGoal(outcome: GoalOutcome) {
+  if (!goal.value)
+    return
+  saving.value = true
+  saveError.value = null
+  try {
+    await updateGoal(goal.value.id, { status: 'completed', outcome })
+    completeOpen.value = false
+    await reloadGoal()
+  }
+  catch (e: unknown) {
+    saveError.value = e instanceof Error ? e.message : 'Не удалось завершить цель'
+  }
+  finally {
+    saving.value = false
+  }
+}
 </script>
 
 <template>
@@ -458,7 +477,7 @@ function onCancelGoalAction() {
     <AppHeader :title="goal.goal_name" :show-back="true">
       <template #right>
         <div class="flex items-center gap-2">
-          <GoalStatusBadge :status="goal.status" />
+          <GoalStatusBadge :status="goal.status" :outcome="goal.outcome" />
           <DropdownMenu>
             <DropdownMenuTrigger as-child>
               <Button
@@ -486,6 +505,12 @@ function onCancelGoalAction() {
                   Открепить
                 </DropdownMenuItem>
               </template>
+              <template v-if="goal.status === 'active'">
+                <DropdownMenuItem data-testid="goal-action-complete" @click="completeOpen = true">
+                  <Flag class="w-4 h-4 mr-2" />
+                  Завершить
+                </DropdownMenuItem>
+              </template>
               <template v-if="goal.status === 'active' || goal.status === 'completed'">
                 <DropdownMenuItem data-testid="goal-action-archive" @click="openGoalAction('archive')">
                   <Archive class="w-4 h-4 mr-2" />
@@ -557,6 +582,17 @@ function onCancelGoalAction() {
         <Check class="size-4 text-green-500" />
         Отчёт на сегодня заполнен
       </div>
+      <Button
+        v-if="goal.status === 'active'"
+        size="lg"
+        variant="outline"
+        class="w-full"
+        data-testid="goal-complete-cta"
+        @click="completeOpen = true"
+      >
+        <Flag class="w-4 h-4 mr-2" />
+        Завершить цель
+      </Button>
 
       <!-- summary (скрываем блок дат у бессрочных целей без дат) -->
       <section v-if="hasDates">
@@ -566,7 +602,7 @@ function onCancelGoalAction() {
           <SummaryCard
             label="Дней до конца"
             :value="goal.status === 'completed' ? '—' : daysLeftVal > 0 ? daysLeftVal : 'Истёк'"
-            :sub="goal.status === 'completed' ? 'Цель завершена' : undefined"
+            :sub="goal.status === 'completed' ? (goal.outcome === 'failure' ? 'Неудача' : 'Достигнута') : undefined"
             :accent="goal.status === 'active' && daysLeftVal > 0"
           />
         </div>
@@ -760,6 +796,43 @@ function onCancelGoalAction() {
       </AlertDialogContent>
     </AlertDialog>
 
+    <AlertDialog
+      :open="completeOpen"
+      @update:open="(o: boolean) => { if (!o) completeOpen = false }"
+    >
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>Завершить цель?</AlertDialogTitle>
+          <AlertDialogDescription>
+            Отметьте, чем закончилась цель. Её можно будет найти во вкладке «Завершённые».
+          </AlertDialogDescription>
+        </AlertDialogHeader>
+        <AlertDialogFooter class="flex-col sm:flex-row gap-2">
+          <AlertDialogCancel :disabled="saving">
+            Отмена
+          </AlertDialogCancel>
+          <Button
+            variant="outline"
+            class="text-rose-700 dark:text-rose-400"
+            data-testid="complete-failure"
+            :disabled="saving"
+            @click="completeGoal('failure')"
+          >
+            <XCircle class="w-4 h-4 mr-1" />
+            Неудача
+          </Button>
+          <Button
+            data-testid="complete-success"
+            :disabled="saving"
+            @click="completeGoal('success')"
+          >
+            <CheckCircle2 class="w-4 h-4 mr-1" />
+            Успех
+          </Button>
+        </AlertDialogFooter>
+      </AlertDialogContent>
+    </AlertDialog>
+
     <AlertDialog
       :open="goalActionPending !== null"
       @update:open="(o: boolean) => { if (!o) goalActionPending = null }"
diff --git a/alfy-bot-frontend/tests/views/GoalView.spec.ts b/alfy-bot-frontend/tests/views/GoalView.spec.ts
index 54d6877..b401969 100644
--- a/alfy-bot-frontend/tests/views/GoalView.spec.ts
+++ b/alfy-bot-frontend/tests/views/GoalView.spec.ts
@@ -290,3 +290,69 @@ describe('goalView — добавление вопроса', () => {
     wrapper.unmount()
   })
 })
+
+describe('goalView — завершение цели', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    setActivePinia(createPinia())
+    const store = useQuestionTypesStore()
+    store.types = SERVER_TYPES
+    store.loaded = true
+    routeParams.id = '5'
+    vi.mocked(fetchGoalById).mockResolvedValue(makeGoal())
+    vi.mocked(fetchGoalReportStatus).mockResolvedValue({
+      goalId: 5,
+      date: '2026-06-04',
+      lastUnfilledDate: null,
+      questions: [],
+      allDone: true,
+    })
+  })
+
+  it('Успех → PATCH status=completed, outcome=success', async () => {
+    const goalsApi = await import('@/api/goals')
+    vi.mocked(goalsApi.updateGoal).mockResolvedValue({
+      ...makeGoal(),
+      status: 'completed',
+      outcome: 'success',
+    })
+    const wrapper = mountGoal()
+    await flushPromises()
+
+    await wrapper.find('[data-testid="goal-complete-cta"]').trigger('click')
+    await flushPromises()
+
+    const success = document.body.querySelector('[data-testid="complete-success"]') as HTMLButtonElement
+    expect(success).toBeTruthy()
+    success.click()
+    await flushPromises()
+
+    expect(goalsApi.updateGoal).toHaveBeenCalledWith(5, {
+      status: 'completed',
+      outcome: 'success',
+    })
+    wrapper.unmount()
+  })
+
+  it('Неудача → PATCH outcome=failure', async () => {
+    const goalsApi = await import('@/api/goals')
+    vi.mocked(goalsApi.updateGoal).mockResolvedValue({
+      ...makeGoal(),
+      status: 'completed',
+      outcome: 'failure',
+    })
+    const wrapper = mountGoal()
+    await flushPromises()
+
+    await wrapper.find('[data-testid="goal-complete-cta"]').trigger('click')
+    await flushPromises()
+    ;(document.body.querySelector('[data-testid="complete-failure"]') as HTMLButtonElement).click()
+    await flushPromises()
+
+    expect(goalsApi.updateGoal).toHaveBeenCalledWith(5, {
+      status: 'completed',
+      outcome: 'failure',
+    })
+    wrapper.unmount()
+  })
+})
diff --git a/alfy-bot/src/modules/bot/scenes/list-goals.scene.ts b/alfy-bot/src/modules/bot/scenes/list-goals.scene.ts
index 3e4cbb9..710f93e 100644
--- a/alfy-bot/src/modules/bot/scenes/list-goals.scene.ts
+++ b/alfy-bot/src/modules/bot/scenes/list-goals.scene.ts
@@ -411,6 +411,11 @@ ${periodLine}📊 Статус: ${statusLabel}
     status: GoalStatus,
   ) {
     await this.goalService.updateGoalStatus(goalId, status);
+    if (status === GOAL_STATUSES.COMPLETED) {
+      await this.goalService.update(goalId, { outcome: 'success' });
+    } else if (status === GOAL_STATUSES.ACTIVE) {
+      await this.goalService.update(goalId, { outcome: null });
+    }
 
     let message = '';
     switch (status) {
diff --git a/alfy-bot/src/modules/goal/dto/goal-response.dto.ts b/alfy-bot/src/modules/goal/dto/goal-response.dto.ts
index d81f9bf..88de566 100644
--- a/alfy-bot/src/modules/goal/dto/goal-response.dto.ts
+++ b/alfy-bot/src/modules/goal/dto/goal-response.dto.ts
@@ -94,9 +94,17 @@ export class GoalDto {
   @ApiPropertyOptional({ example: '2026-05-01', nullable: true })
   goal_end: string | null;
 
-  @ApiProperty({ example: 'active', enum: ['active', 'completed', 'deleted'] })
+  @ApiProperty({ example: 'active', enum: ['active', 'completed', 'archived', 'deleted'] })
   status: string;
 
+  @ApiPropertyOptional({
+    example: 'success',
+    enum: ['success', 'failure'],
+    nullable: true,
+    description: 'Результат завершения: успех или неудача. null пока цель активна',
+  })
+  outcome: 'success' | 'failure' | null;
+
   @ApiProperty({
     example: false,
     description: 'Глобальная цель (без дат и вопросов, может иметь подцели)',
diff --git a/alfy-bot/src/modules/goal/dto/update-goal.dto.ts b/alfy-bot/src/modules/goal/dto/update-goal.dto.ts
index 119b28b..89d96b1 100644
--- a/alfy-bot/src/modules/goal/dto/update-goal.dto.ts
+++ b/alfy-bot/src/modules/goal/dto/update-goal.dto.ts
@@ -16,6 +16,16 @@ export class UpdateGoalDto {
   @IsString()
   goal_name?: string;
 
+  @ApiPropertyOptional({
+    example: 'success',
+    enum: ['success', 'failure'],
+    nullable: true,
+    description: 'Флаг завершения. Шлётся вместе со status=completed',
+  })
+  @IsOptional()
+  @IsIn(['success', 'failure'])
+  outcome?: 'success' | 'failure' | null;
+
   @ApiPropertyOptional({
     example: 1,
     description:
diff --git a/alfy-bot/src/modules/goal/goal.controller.spec.ts b/alfy-bot/src/modules/goal/goal.controller.spec.ts
index 6da4aab..0135929 100644
--- a/alfy-bot/src/modules/goal/goal.controller.spec.ts
+++ b/alfy-bot/src/modules/goal/goal.controller.spec.ts
@@ -407,6 +407,37 @@ describe('GoalController', () => {
       expect(result).toBe(updated);
     });
 
+    it('status=completed + outcome=failure пишет оба поля', async () => {
+      const userId = 42;
+      const goalId = 7;
+      const owned = makeGoal({ id: goalId, user_id: userId, status: 'active' });
+      const updated = makeGoal({
+        id: goalId,
+        user_id: userId,
+        status: 'completed',
+        outcome: 'failure',
+      });
+      goalService.findById
+        .mockResolvedValueOnce(owned)
+        .mockResolvedValueOnce(updated);
+      goalService.updateGoalStatus.mockResolvedValue(undefined);
+      goalService.update.mockResolvedValue(updated);
+
+      const dto: UpdateGoalDto = { status: 'completed', outcome: 'failure' };
+      const req = { user: { sub: userId } } as AuthRequestLike;
+
+      const result = await controller.update(req as never, goalId, dto);
+
+      expect(goalService.updateGoalStatus).toHaveBeenCalledWith(
+        goalId,
+        'completed',
+      );
+      expect(goalService.update).toHaveBeenCalledWith(goalId, {
+        outcome: 'failure',
+      });
+      expect(result).toBe(updated);
+    });
+
     it('валидный parent_goal_id → assertValidParent + update', async () => {
       const userId = 42;
       const goalId = 7;
diff --git a/alfy-bot/src/modules/goal/goal.controller.ts b/alfy-bot/src/modules/goal/goal.controller.ts
index e7a71c1..61a290d 100644
--- a/alfy-bot/src/modules/goal/goal.controller.ts
+++ b/alfy-bot/src/modules/goal/goal.controller.ts
@@ -196,6 +196,12 @@ export class GoalController {
 
     if (dto.status) {
       await this.goalService.updateGoalStatus(id, dto.status);
+      if (dto.status !== 'completed') {
+        await this.goalService.update(id, { outcome: null });
+      }
+    }
+    if (dto.outcome !== undefined) {
+      await this.goalService.update(id, { outcome: dto.outcome });
     }
     if (dto.goal_name) {
       await this.goalService.update(id, { goal_name: dto.goal_name });
diff --git a/alfy-bot/src/shared/entities/goal.entity.ts b/alfy-bot/src/shared/entities/goal.entity.ts
index b154911..91a1a55 100644
--- a/alfy-bot/src/shared/entities/goal.entity.ts
+++ b/alfy-bot/src/shared/entities/goal.entity.ts
@@ -30,6 +30,10 @@ export class Goal {
   @Column({ default: false })
   is_global: boolean;
 
+  /** Set when status becomes completed: success | failure. Null while active. */
+  @Column({ type: 'text', nullable: true })
+  outcome: 'success' | 'failure' | null;
+
   @Column({ type: 'integer', nullable: true })
   parent_goal_id: number | null;