Change half hitas report to include released housing companies as well

backend/hitas/services/housing_company.py

@@ -340,14 +340,13 @@ def find_regulated_housing_companies_for_reporting() -> list[HousingCompanyWithR
     )
 
 
-def find_regulated_half_hitas_housing_companies_for_reporting() -> list[HousingCompanyWithRegulatedReportAnnotations]:
+def find_half_hitas_housing_companies_for_reporting() -> list[HousingCompanyWithRegulatedReportAnnotations]:
     return list(
         HousingCompany.objects.select_related("postal_code")
         .prefetch_related(
             "real_estates__buildings__apartments",
         )
         .filter(
-            regulation_status=RegulationStatus.REGULATED,
             hitas_type=HitasType.HALF_HITAS,
         )
         .alias(

backend/hitas/tests/apis/test_api_reports.py

@@ -540,7 +540,7 @@ def test__api__regulated_housing_companies_report__multiple_housing_companies(ap
 
 
 @pytest.mark.django_db
-def test__api__regulated_half_hitas_housing_companies_report__multiple_housing_companies(api_client: HitasAPIClient):
+def test__api__half_hitas_housing_companies_report__multiple_housing_companies(api_client: HitasAPIClient):
     housing_company_1: HousingCompany = HousingCompanyFactory.create(
         postal_code__value="00001",
         postal_code__cost_area=1,
@@ -569,7 +569,7 @@ def test__api__regulated_half_hitas_housing_companies_report__multiple_housing_c
         apartment__building__real_estate__housing_company=housing_company_2,
     )
 
-    url = reverse("hitas:regulated-half-hitas-housing-companies-report-list")
+    url = reverse("hitas:half-hitas-housing-companies-report-list")
     response: HttpResponse = api_client.get(url)
 
     workbook: Workbook = load_workbook(BytesIO(response.content), data_only=False)

backend/hitas/urls.py

@@ -85,11 +85,11 @@
     basename="regulated-housing-companies-report",
 )
 
-# /api/v1/reports/download-regulated-half-hitas-housing-companies-report
+# /api/v1/reports/download-half-hitas-housing-companies-report
 router.register(
-    r"reports/download-regulated-half-hitas-housing-companies-report",
-    views.RegulatedHalfHitasHousingCompaniesReportView,
-    basename="regulated-half-hitas-housing-companies-report",
+    r"reports/download-half-hitas-housing-companies-report",
+    views.HalfHitasHousingCompaniesReportView,
+    basename="half-hitas-housing-companies-report",
 )
 
 # /api/v1/reports/download-unregulated-housing-companies-report

backend/hitas/views/__init__.py

@@ -29,12 +29,12 @@
 from hitas.views.property_manager import PropertyManagerViewSet
 from hitas.views.real_estate import RealEstateViewSet
 from hitas.views.reports import (
+    HalfHitasHousingCompaniesReportView,
     HousingCompanyStatesJSONReportView,
     HousingCompanyStatesReportView,
     MultipleOwnershipsReportView,
     OwnershipsByCompanyJSONReportView,
     OwnershipsByHousingCompanyReport,
-    RegulatedHalfHitasHousingCompaniesReportView,
     RegulatedHousingCompaniesReportView,
     RegulatedOwnershipsReportView,
     SalesByPostalCodeAndAreaReportView,

backend/hitas/views/reports.py

@@ -10,8 +10,8 @@
 from hitas.models import HousingCompany, Owner, Ownership
 from hitas.services.apartment_sale import find_sales_on_interval_for_reporting
 from hitas.services.housing_company import (
+    find_half_hitas_housing_companies_for_reporting,
     find_housing_companies_for_state_reporting,
-    find_regulated_half_hitas_housing_companies_for_reporting,
     find_regulated_housing_companies_for_reporting,
     find_unregulated_housing_companies_for_reporting,
 )
@@ -73,13 +73,13 @@ def list(self, request: Request, *args, **kwargs) -> HttpResponse:
         return get_excel_response(filename=filename, excel=workbook)
 
 
-class RegulatedHalfHitasHousingCompaniesReportView(ViewSet):
+class HalfHitasHousingCompaniesReportView(ViewSet):
     renderer_classes = [HitasJSONRenderer, ExcelRenderer]
 
     def list(self, request: Request, *args, **kwargs) -> HttpResponse:
-        housing_companies = find_regulated_half_hitas_housing_companies_for_reporting()
+        housing_companies = find_half_hitas_housing_companies_for_reporting()
         workbook = build_regulated_housing_companies_report_excel(housing_companies)
-        filename = "Valvonnan piirissä olevat puolihitas-yhtiöt.xlsx"
+        filename = "Puolihitas-yhtiöt.xlsx"
         return get_excel_response(filename=filename, excel=workbook)
 
 

backend/openapi.yaml

@@ -4008,15 +4008,15 @@ paths:
         "500":
           $ref: "#/components/responses/InternalServerError"
 
-  /api/v1/reports/download-regulated-half-hitas-housing-companies-report:
+  /api/v1/reports/download-half-hitas-housing-companies-report:
     get:
-      description: Download an Excel report of half hitas regulated housing companies
-      operationId: fetch-regulated-half-hitas-housing-companies-report-excel
+      description: Download an Excel report of half hitas housing companies
+      operationId: fetch-half-hitas-housing-companies-report-excel
       tags:
         - Reports
       responses:
         "200":
-          description: Successfully downloaded a regulated half hitas housing company report
+          description: Successfully downloaded a half hitas housing company report
           content:
             application/vnd.openxmlformats-officedocument.spreadsheetml.sheet:
               schema:

frontend/src/common/services/hitasApi/reports.ts

@@ -62,8 +62,8 @@ export const downloadSalesByPostalCodeAndAreaReportPDF = ({
 export const downloadRegulatedHousingCompaniesPDF = () =>
     fetchAndDownloadPDF("/reports/download-regulated-housing-companies-report");
 
-export const downloadRegulatedHalfHitasHousingCompaniesExcel = () =>
-    fetchAndDownloadPDF("/reports/download-regulated-half-hitas-housing-companies-report");
+export const downloadHalfHitasHousingCompaniesExcel = () =>
+    fetchAndDownloadPDF("/reports/download-half-hitas-housing-companies-report");
 
 export const downloadUnregulatedHousingCompaniesPDF = () =>
     fetchAndDownloadPDF("/reports/download-unregulated-housing-companies-report");

frontend/src/features/reports/ReportsPage.tsx

@@ -2,7 +2,7 @@ import {Accordion} from "hds-react";
 import {Divider, Heading} from "../../common/components";
 import {
     HousingCompanyReportRegulated,
-    HousingCompanyReportRegulatedHalfHitas,
+    HousingCompanyReportHalfHitas,
     HousingCompanyReportReleased,
     HousingCompanyStatusTable,
 } from "./components/HousingCompanyReports";
@@ -35,9 +35,9 @@ const ReportsPage = () => {
                     <Divider size="s" />
                     <HousingCompanyReportRegulated />
                     <Divider size="s" />
-                    <HousingCompanyReportRegulatedHalfHitas />
-                    <Divider size="s" />
                     <HousingCompanyReportReleased />
+                    <Divider size="s" />
+                    <HousingCompanyReportHalfHitas />
                 </Accordion>
 
                 <Accordion

frontend/src/features/reports/components/HousingCompanyReports.tsx

@@ -3,7 +3,7 @@ import {DownloadButton, Heading, QueryStateHandler} from "../../../common/compon
 import {IHousingCompanyState} from "../../../common/schemas";
 import {
     downloadHousingCompanyStatesReportPDF,
-    downloadRegulatedHalfHitasHousingCompaniesExcel,
+    downloadHalfHitasHousingCompaniesExcel,
     downloadRegulatedHousingCompaniesPDF,
     downloadUnregulatedHousingCompaniesPDF,
     useGetHousingCompanyStatesQuery,
@@ -71,33 +71,33 @@ export const HousingCompanyReportRegulated = () => {
     );
 };
 
-export const HousingCompanyReportRegulatedHalfHitas = () => {
+export const HousingCompanyReportReleased = () => {
     return (
         <div className="report-container">
             <div className="column">
-                <Heading type="sub">Säännellyt Puolihitas-yhtiöt</Heading>
-                <span>Listaus sääntelyn piirissä olevista Puolihitas-taloyhtiöistä</span>
+                <Heading type="sub">Vapautuneet yhtiöt</Heading>
+                <span>Listaus sääntelystä piiristä vapautuneista taloyhtiöistä</span>
                 <div>
                     <DownloadButton
                         buttonText="Lataa raportti"
-                        onClick={downloadRegulatedHalfHitasHousingCompaniesExcel}
+                        onClick={downloadUnregulatedHousingCompaniesPDF}
                     />
                 </div>
             </div>
         </div>
     );
 };
 
-export const HousingCompanyReportReleased = () => {
+export const HousingCompanyReportHalfHitas = () => {
     return (
         <div className="report-container">
             <div className="column">
-                <Heading type="sub">Vapautuneet yhtiöt</Heading>
-                <span>Listaus sääntelystä piiristä vapautuneista taloyhtiöistä</span>
+                <Heading type="sub">Puolihitas-yhtiöt</Heading>
+                <span>Listaus Puolihitas-taloyhtiöistä</span>
                 <div>
                     <DownloadButton
                         buttonText="Lataa raportti"
-                        onClick={downloadUnregulatedHousingCompaniesPDF}
+                        onClick={downloadHalfHitasHousingCompaniesExcel}
                     />
                 </div>
             </div>