Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use vaccination database data for Tempat vaksin #817

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
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
4 changes: 4 additions & 0 deletions __tests__/pages/provinces/[provinceSlug]/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ import React from "react";
import { render, screen } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import provinces from "~/lib/data/provinces";
import vaccination from "~/lib/data/vaccination";
import ProvincePage, {
getStaticPaths,
getStaticProps,
} from "~/pages/provinces/[provinceSlug]";

jest.mock("~/lib/data/provinces");
jest.mock("~/lib/data/vaccination");
jest.mock("next/router", () => require("next-router-mock"));

describe("ProvincePage", () => {
Expand Down Expand Up @@ -104,6 +106,7 @@ describe("getStaticProps", () => {
const [province] = provinces;
const [unverifiedContact, verifiedContactBravo, verifiedContactAlpha] =
province.data;
const [vaccinationContact] = vaccination["Province A"];

it("gets the provinceName and sorted contactList from the provinceSlug params", () => {
expect(
Expand All @@ -117,6 +120,7 @@ describe("getStaticProps", () => {
contactList: [
verifiedContactAlpha,
verifiedContactBravo,
vaccinationContact,
unverifiedContact,
],
},
Expand Down
3 changes: 2 additions & 1 deletion etc/fetchers/fetch-vaccination-database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ export async function fetchVaccinationDatabase() {
fetch(`${vaksinId}/locations/${province}`)
.then((res) => res.json() as unknown as VaccinationRegion)
.then((region) => {
locations[region.data[0].province] = region.data.map((location) => ({
locations[province] = region.data.map((location) => ({
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice heads up on that one.

id: `${region.data.findIndex(
(index) => location.title === index.title,
)}`,
keterangan: "Lokasi Vaksinasi COVID-19",
kebutuhan: "Tempat vaksin",
lokasi: location.city,
verifikasi: location.isvalid ? 1 : 0,
penyedia: location.title,
Expand Down
6 changes: 5 additions & 1 deletion lib/data/__mocks__/builders/provinces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ export const contactBuilder = build<Contact>({
"Pemakaman",
"Puskesmas",
"Rumah sakit",
"Tempat vaksin",
"Tes swab",
),
penyedia: fake((f) => f.company.companyName()),
Expand Down Expand Up @@ -53,6 +52,11 @@ export const provinceBuilder = build<Province>({
penyedia: perBuild(() => "Alpha"),
},
}),
contactBuilder({
overrides: {
kebutuhan: perBuild(() => "Tempat vaksin"),
},
}),
],
},
});
24 changes: 24 additions & 0 deletions lib/data/__mocks__/builders/vaccination.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { build, fake } from "@jackfranklin/test-data-bot";
import { sequence } from "@jackfranklin/test-data-bot/build";
import { VaccinationContact } from "../../vaccination";

export const vaccinationContactBuilder = build<VaccinationContact>({
fields: {
id: sequence(),
slug: fake((f) => f.lorem.slug()),
kebutuhan: "Tempat vaksin",
penyedia: fake((f) => f.company.companyName()),
keterangan: fake((f) => f.commerce.productName()),
kontak: fake((f) => f.phone.phoneNumber()),
alamat: fake((f) => f.address.streetAddress()),
verifikasi: 1,
catatan_ketersediaan: fake((f) => f.lorem.sentence()),
rentang_umur: ["Dewasa (18-59 Tahun)", "Lansia (60-)"],
buka_waktu: "09:00:00",
tutup_waktu: "12:00:00",
mulai_tanggal: "2021-07-26",
selesai_tanggal: "2021-07-30",
map: "https://goo.gl/maps/L7BUJexFx3Fiy36bA",
link: fake((f) => f.internet.domainName()),
},
});
13 changes: 12 additions & 1 deletion lib/data/__mocks__/provinces.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
import { provinceBuilder } from "./builders/provinces";

const provinces = [provinceBuilder(), provinceBuilder()];
const provinces = [
provinceBuilder({
overrides: {
name: "Province A",
},
}),
provinceBuilder({
overrides: {
name: "Province B",
},
}),
];

export default provinces;
7 changes: 7 additions & 0 deletions lib/data/__mocks__/vaccination.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { vaccinationContactBuilder } from "./builders/vaccination";

const vaccination = Object.create({
"Province A": [vaccinationContactBuilder()],
"Province B": [vaccinationContactBuilder()],
});
export default vaccination;
5 changes: 5 additions & 0 deletions lib/data/vaccination.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Contact } from "./provinces";
import vaccination from "~/data/wbw-vaccination-database.json";

type City = `${"Kab." | "Kota"} ${string}`;
type DateString = `${number}-${number}-${number}`;
Expand Down Expand Up @@ -51,3 +52,7 @@ export interface VaccinationContact extends Contact {
map: _location["map"];
link: _location["link"];
}

export type Vaccination = { [province: string]: VaccinationContact[] };

export default vaccination as unknown as Vaccination;
8 changes: 6 additions & 2 deletions pages/provinces/[provinceSlug]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { SearchForm } from "~/components/search-form";
import { SeoText } from "~/components/seo-text";
import { getProvincesPaths } from "~/lib/data/helpers/provinces";
import provinces, { Contact } from "~/lib/data/provinces";
import vaccination from "~/lib/data/vaccination";
import { getCurrentLongDate } from "~/lib/date-utils";
import { useSearch } from "~/lib/hooks/use-search";
import { getProvinceMeta } from "~/lib/meta";
Expand Down Expand Up @@ -124,8 +125,11 @@ export const getStaticProps: GetStaticProps = ({ params = {} }) => {
const { provinceSlug } = params;
const province = provinces.find((prov) => prov.slug === provinceSlug);
const provinceName = province ? province.name : "";
const contactList = province
? [...province.data].sort((a, b) => {
const contacts = province?.data.filter(
(contact) => contact.kebutuhan !== "Tempat vaksin",
);
const contactList = contacts
? [...contacts, ...vaccination[provinceName]].sort((a, b) => {
return (
b.verifikasi - a.verifikasi ||
(a.penyedia ?? "").localeCompare(b.penyedia ?? "")
Expand Down