Merge pull request #168 from spendingjp/feature/issue-137-add-transition-to-mapping

Feature/issue 137 add transition to mapping

Author: yuukiootaki

Diff for: backend/budgetmapper/tests/test_request.py

@@ -111,7 +111,6 @@ def test_destroy_returns_method_not_allowed_error_for_member(self) -> None:
         self.assertEqual(res.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
 
     def test_get(self) -> None:
-        self.maxDiff = None
         gov = factories.GovernmentFactory(name="まほろ市", slug="mahoro-city")
         cs = factories.ClassificationSystemFactory(name="まほろ市2101年一般会計", slug="mahoro-city-2101-ippan-kaikei")
         icon0 = factories.IconImageFactory()
@@ -281,7 +280,6 @@ def test_get(self) -> None:
         self.assertEqual(actual, expected)
 
     def test_get_mapped_budget(self) -> None:
-        self.maxDiff = None
         gov = factories.GovernmentFactory()
         cs0 = factories.ClassificationSystemFactory()
         bud0 = factories.BasicBudgetFactory(classification_system=cs0, government_value=gov)
@@ -777,6 +775,84 @@ def test_update_blank_slug_by_slug(self, jp_slugify):
             self.assertEqual(actual, expected)
 
 
+class MappedBudgetCandidateTestCase(BudgetMapperTestUserAPITestCase):
+    def test_mapped_budget_candidates(self):
+        cs = [factories.ClassificationSystemFactory() for _ in range(4)]
+        gov = factories.GovernmentFactory()
+        bb0_2100 = factories.BasicBudgetFactory(classification_system=cs[0], government_value=gov, year_value=2100)
+        bb0_2101 = factories.BasicBudgetFactory(classification_system=cs[0], government_value=gov, year_value=2101)
+        bb0_2102 = factories.BasicBudgetFactory(classification_system=cs[0], government_value=gov, year_value=2102)
+        factories.BasicBudgetFactory(classification_system=cs[1], government_value=gov, year_value=2100)
+        factories.MappedBudgetFactory(classification_system=cs[2], source_budget=bb0_2100)
+        factories.MappedBudgetFactory(classification_system=cs[2], source_budget=bb0_2101)
+        expected = sorted(
+            [
+                {
+                    "id": cs[2].id,
+                    "name": cs[2].name,
+                    "slug": cs[2].slug,
+                    "levelNames": cs[2].level_names,
+                    "createdAt": cs[2].created_at.strftime(datetime_format),
+                    "updatedAt": cs[2].updated_at.strftime(datetime_format),
+                },
+                {
+                    "id": cs[3].id,
+                    "name": cs[3].name,
+                    "slug": cs[3].slug,
+                    "levelNames": cs[3].level_names,
+                    "createdAt": cs[3].created_at.strftime(datetime_format),
+                    "updatedAt": cs[3].updated_at.strftime(datetime_format),
+                },
+            ],
+            key=lambda d: d["createdAt"],
+        )
+        res = self.client.get(f"/api/v1/budgets/{bb0_2100.id}/mapped-budget-candidates/", format="json")
+        actual = sorted(res.json()["results"], key=lambda d: d["createdAt"])
+        self.assertEqual(actual, expected)
+
+        expected = sorted(
+            [
+                {
+                    "id": cs[1].id,
+                    "name": cs[1].name,
+                    "slug": cs[1].slug,
+                    "levelNames": cs[1].level_names,
+                    "createdAt": cs[1].created_at.strftime(datetime_format),
+                    "updatedAt": cs[1].updated_at.strftime(datetime_format),
+                },
+                {
+                    "id": cs[2].id,
+                    "name": cs[2].name,
+                    "slug": cs[2].slug,
+                    "levelNames": cs[2].level_names,
+                    "createdAt": cs[2].created_at.strftime(datetime_format),
+                    "updatedAt": cs[2].updated_at.strftime(datetime_format),
+                },
+                {
+                    "id": cs[3].id,
+                    "name": cs[3].name,
+                    "slug": cs[3].slug,
+                    "levelNames": cs[3].level_names,
+                    "createdAt": cs[3].created_at.strftime(datetime_format),
+                    "updatedAt": cs[3].updated_at.strftime(datetime_format),
+                },
+            ],
+            key=lambda d: d["createdAt"],
+        )
+        res = self.client.get(f"/api/v1/budgets/{bb0_2102.id}/mapped-budget-candidates/", format="json")
+        actual = sorted(res.json()["results"], key=lambda d: d["createdAt"])
+        self.assertEqual(actual, expected)
+
+    def test_404_if_no_budget(self):
+        res = self.client.get("/api/v1/budgets/nonsuch/mapped-budget-candidates/")
+        self.assertEqual(res.status_code, status.HTTP_404_NOT_FOUND)
+
+    def test_404_if_mapped_budget(self):
+        mb = factories.MappedBudgetFactory()
+        res = self.client.get(f"/api/v1/budgets/{mb.id}/mapped-budget-candidates/")
+        self.assertEqual(res.status_code, status.HTTP_404_NOT_FOUND)
+
+
 class ClassificationCrudTestCase(BudgetMapperTestUserAPITestCase):
     def test_list(self):
         ordering = CreatedAtPagination.ordering
@@ -815,7 +891,6 @@ def test_list(self):
         self.assertEqual(actual, expected)
 
     def test_get(self):
-        self.maxDiff = None
         cs = factories.ClassificationSystemFactory()
         classification_parent_a = factories.ClassificationFactory(classification_system=cs)
         c = factories.ClassificationFactory(classification_system=cs, parent=classification_parent_a)
@@ -1175,6 +1250,82 @@ def test_list_can_filter_by_government_and_year(self):
         actual = res_json["results"]
         self.assertEqual(actual, expected)
 
+    def test_list_can_filter_by_source_budget(self) -> None:
+        ordering = CreatedAtPagination.ordering
+        page_size = CreatedAtPagination.page_size
+        gov = factories.GovernmentFactory()
+        bud0 = factories.BasicBudgetFactory(government_value=gov)
+        bud1 = factories.BasicBudgetFactory(government_value=gov)
+        cs0 = factories.ClassificationSystemFactory()
+        cs1 = factories.ClassificationSystemFactory()
+        bud000 = factories.MappedBudgetFactory(source_budget=bud0, classification_system=cs0)
+        bud001 = factories.MappedBudgetFactory(source_budget=bud0, classification_system=cs0)
+        bud100 = factories.MappedBudgetFactory(source_budget=bud0, classification_system=cs1)
+        factories.MappedBudgetFactory(source_budget=bud1, classification_system=cs0)
+
+        res = self.client.get(f"/api/v1/budgets/?sourceBudget={bud0.id}", format="json")
+        expected = [
+            {
+                "id": b.id,
+                "name": b.name,
+                "slug": b.slug,
+                "year": b.year,
+                "subtitle": b.subtitle,
+                "classificationSystem": b.classification_system.id,
+                "government": b.government.id,
+                "createdAt": b.created_at.strftime(datetime_format),
+                "updatedAt": b.updated_at.strftime(datetime_format),
+                "sourceBudget": b.source_budget.id,
+            }
+            for b in sorted(
+                [bud000, bud001, bud100],
+                key=lambda b: getattr(b, ordering.strip("-")),
+                reverse=ordering.startswith("-"),
+            )
+        ][:page_size]
+
+        res_json = res.json()
+        self.assertIn("results", res_json)
+        actual = res_json["results"]
+        self.assertEqual(actual, expected)
+
+    def test_list_can_filter_by_source_budget_and_classification_system(self) -> None:
+        ordering = CreatedAtPagination.ordering
+        page_size = CreatedAtPagination.page_size
+        gov = factories.GovernmentFactory()
+        bud0 = factories.BasicBudgetFactory(government_value=gov)
+        bud1 = factories.BasicBudgetFactory(government_value=gov)
+        cs0 = factories.ClassificationSystemFactory()
+        cs1 = factories.ClassificationSystemFactory()
+        bud000 = factories.MappedBudgetFactory(source_budget=bud0, classification_system=cs0)
+        bud001 = factories.MappedBudgetFactory(source_budget=bud0, classification_system=cs0)
+        factories.MappedBudgetFactory(source_budget=bud0, classification_system=cs1)
+        factories.MappedBudgetFactory(source_budget=bud1, classification_system=cs0)
+
+        res = self.client.get(f"/api/v1/budgets/?sourceBudget={bud0.id}&classificationSystem={cs0.id}", format="json")
+        expected = [
+            {
+                "id": b.id,
+                "name": b.name,
+                "slug": b.slug,
+                "year": b.year,
+                "subtitle": b.subtitle,
+                "classificationSystem": b.classification_system.id,
+                "government": b.government.id,
+                "createdAt": b.created_at.strftime(datetime_format),
+                "updatedAt": b.updated_at.strftime(datetime_format),
+                "sourceBudget": b.source_budget.id,
+            }
+            for b in sorted(
+                [bud000, bud001], key=lambda b: getattr(b, ordering.strip("-")), reverse=ordering.startswith("-")
+            )
+        ][:page_size]
+
+        res_json = res.json()
+        self.assertIn("results", res_json)
+        actual = res_json["results"]
+        self.assertEqual(actual, expected)
+
     def test_retrieve_basic(self):
         bs = [factories.BasicBudgetFactory() for i in range(100)]
         b = bs[random.randint(0, 99)]
@@ -1211,7 +1362,6 @@ def test_retrieve_basic(self):
         self.assertEqual(actual, expected)
 
     def test_retrieve_mapped(self):
-        self.maxDiff = None
         bs = [factories.MappedBudgetFactory() for i in range(100)]
         b = random.choice(bs)
         res = self.client.get(f"/api/v1/budgets/{b.id}/", format="json")

Diff for: backend/budgetmapper/urls.py

@@ -20,6 +20,9 @@
 )
 budget_router = routers.NestedDefaultRouter(router, r"budgets", lookup="budget")
 budget_router.register(r"items", views.BudgetItemViewSet, basename="budget-item")
+budget_router.register(
+    r"mapped-budget-candidates", views.MappedgBudgetCandidateView, basename="budget-mapping-budget-candidate"
+)
 
 urlpatterns = [
     path("api/v1/", include(router.urls)),

Diff for: backend/budgetmapper/views.py

@@ -63,6 +63,19 @@ def get_serializer_class(self):
         return serializers.ClassificationSystemSerializer
 
 
+class MappedgBudgetCandidateView(mixins.ListModelMixin, viewsets.GenericViewSet):
+    serializer_class = serializers.ClassificationSystemSerializer
+    pagination_class = CreatedAtPagination
+
+    def get_queryset(self):
+        budget = get_object_or_404(models.BasicBudget.objects, pk=self.kwargs["budget_pk"])
+        return models.ClassificationSystem.objects.exclude(
+            pk__in=models.BasicBudget.objects.filter(
+                government_value=budget.government_value, year_value=budget.year_value
+            ).values("classification_system")
+        )
+
+
 class ClassificationViewSet(viewsets.ModelViewSet):
     def get_queryset(self):
         return models.Classification.objects.filter(classification_system=self.kwargs["classification_system_pk"])
@@ -77,6 +90,19 @@ def get_serializer_class(self):
 
 class BudgetFilter(filters.BaseFilterBackend):
     def filter_queryset(self, request, queryset, view):
+        if "sourceBudget" in request.query_params:
+            return queryset.filter(
+                Q(
+                    pk__in=models.MappedBudget.objects.filter(
+                        **dict(
+                            {}
+                            if "classificationSystem" not in request.query_params
+                            else {"classification_system": request.query_params["classificationSystem"]},
+                            source_budget=request.query_params.get("sourceBudget"),
+                        )
+                    ).values("id")
+                )
+            )
         basic_qs = models.BasicBudget.objects
         if "government" in request.query_params:
             basic_qs = basic_qs.filter(government_value_id=request.query_params["government"])

Diff for: frontend/components/MappingBudgetCreationForm.vue

@@ -0,0 +1,148 @@
+<template>
+  <v-dialog v-model="state.dialog" max-width="600px">
+    <template #activator="{ on, attrs }">
+      <v-btn v-bind="attrs" v-on="on">
+        この予算を元にマッピングを編集/作成
+      </v-btn>
+    </template>
+    <v-card>
+      <v-tabs v-model="state.tab" centered dark icons-and-text>
+        <v-tabs-slider></v-tabs-slider>
+        <v-tab>編集<v-icon>mdi-pencil</v-icon></v-tab>
+        <v-tab>新規作成<v-icon>mdi-plus</v-icon></v-tab>
+        <v-tabs-items v-model="state.tab">
+          <v-tab-item>
+            <v-card-title>編集する予算を選択</v-card-title>
+            <v-card-text>
+              <v-container>
+                <v-row>
+                  <v-autocomplete
+                    v-model="state.selectedMappedBudgetSlug"
+                    :items="relatedBudgets"
+                    item-text="name"
+                    item-value="slug"
+                    label="編集する予算"
+                  ></v-autocomplete>
+                </v-row>
+              </v-container>
+            </v-card-text>
+            <v-card-actions>
+              <v-spacer></v-spacer>
+              <v-btn @click="state.dialog = false"> キャンセル </v-btn>
+              <v-btn
+                :to="`/budgets/${state.selectedMappedBudgetSlug}/mapping`"
+                :disabled="state.selectedMappedBudgetSlug === null"
+                nuxt
+                >編集</v-btn
+              >
+            </v-card-actions>
+          </v-tab-item>
+          <v-tab-item>
+            <v-card-title>マッピング先の予算を選択 </v-card-title>
+            <v-card-text>
+              <v-container>
+                <v-row>
+                  <v-text-field
+                    v-model="state.newBudgetName"
+                    label="予算名"
+                    required
+                  ></v-text-field>
+                </v-row>
+                <v-row>
+                  <v-autocomplete
+                    v-model="state.selectedClassificationSystemIdForNewBudget"
+                    :items="mappedBudgetCandidate"
+                    item-text="name"
+                    item-value="id"
+                    label="マッピング先の予算体系"
+                  ></v-autocomplete>
+                </v-row>
+              </v-container>
+            </v-card-text>
+            <v-card-actions>
+              <v-spacer></v-spacer>
+              <v-btn @click="state.dialog = false"> キャンセル </v-btn>
+              <v-btn
+                :disabled="
+                  state.selectedClassificationSystemIdForNewBudget === null ||
+                  state.newBudgetName === ''
+                "
+                @click="handleCreateNewBudget"
+                >新規作成</v-btn
+              >
+            </v-card-actions>
+          </v-tab-item>
+          <v-tab-item>tab2</v-tab-item>
+        </v-tabs-items>
+      </v-tabs>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script lang="ts">
+import { defineComponent, reactive } from '@vue/composition-api'
+import { useAsync, SetupContext, useRouter } from '@nuxtjs/composition-api'
+import authHeader from '@/services/auth-header'
+import { $axios } from '@/utils/api-accessor'
+import { ClassificationSystemListItem } from '@/types/classification-system-list-item'
+import { Budget } from '@/types/budget'
+
+type State = {
+  dialog: Boolean
+  selectedMappedBudgetSlug: string | null
+  newBudgetName: string
+  selectedClassificationSystemIdForNewBudget: string | null
+}
+
+export default defineComponent({
+  components: {},
+  props: {
+    currentBudgetId: {
+      type: String,
+      default: '',
+      required: true,
+    },
+    mappedBudgetCandidate: {
+      type: Array as () => ClassificationSystemListItem[],
+      default: () => [],
+    },
+    relatedBudgets: {
+      type: Array as () => Budget[],
+      default: () => [],
+    },
+  },
+  setup({ currentBudgetId }, ctx: SetupContext) {
+    const state = reactive<State>({
+      dialog: false,
+      selectedMappedBudgetSlug: null,
+      newBudgetName: '',
+      selectedClassificationSystemIdForNewBudget: null,
+    })
+    const router = useRouter()
+    const handleCreateNewBudget = (): void => {
+      useAsync(async () => {
+        try {
+          const res = (
+            await $axios.post<Budget>(
+              '/api/v1/budgets/',
+              {
+                sourceBudget: currentBudgetId,
+                classificationSystem:
+                  state.selectedClassificationSystemIdForNewBudget,
+                name: state.newBudgetName,
+              },
+              {
+                headers: authHeader(),
+              }
+            )
+          ).data
+          router.push(`/budgets/${res.slug}/mapping/`)
+        } catch (error) {
+          ctx.emit('error', '新規予算作成に失敗しました')
+        }
+      })
+    }
+    return { state, handleCreateNewBudget }
+  },
+})
+</script>