Merge pull request #8 from crab85193/develop

crab85193 · web-flow · commit 56cd2572da44 · 2024-12-18T23:17:38.000+09:00
API URLを直指定して本番環境でのundefined問題を解消
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,6 @@ jobs:
       - name: Make envfile
         uses: SpicyPizza/create-envfile@v2.0
         with:
-          envkey_REACT_APP_YUMEMI_API_URL: ${{ secrets.YUMEMI_API_URL }}
           envkey_REACT_APP_YUMEMI_API_KEY: ${{ secrets.YUMEMI_API_KEY }}
           directory: ./
           file_name: .env
diff --git a/.github/workflows/deploy-ph-pages.yml b/.github/workflows/deploy-ph-pages.yml
@@ -22,7 +22,6 @@ jobs:
       - name: Make envfile
         uses: SpicyPizza/create-envfile@v2.0
         with:
-          envkey_REACT_APP_YUMEMI_API_URL: ${{ secrets.YUMEMI_API_URL }}
           envkey_REACT_APP_YUMEMI_API_KEY: ${{ secrets.YUMEMI_API_KEY }}
           directory: ./
           file_name: .env
diff --git a/src/api/population.ts b/src/api/population.ts
@@ -6,7 +6,7 @@ export const fetchPopulation = async (
 ): Promise<PopulationCategory[]> => {
   try {
     const response = await axios.get<PopulationResponse>(
-      `${process.env.REACT_APP_YUMEMI_API_URL}/api/v1/population/composition/perYear?prefCode=${prefCode}`,
+      `https://yumemi-frontend-engineer-codecheck-api.vercel.app/api/v1/population/composition/perYear?prefCode=${prefCode}`,
       {
         headers: {
           "X-API-KEY": process.env.REACT_APP_YUMEMI_API_KEY!,
diff --git a/src/api/prefectures.ts b/src/api/prefectures.ts
@@ -4,7 +4,7 @@ import { Prefecture } from "../types/prefecture";
 export const fetchPrefectures = async (): Promise<Prefecture[]> => {
   try {
     const response = await axios.get(
-      `${process.env.REACT_APP_YUMEMI_API_URL}/api/v1/prefectures`,
+      `https://yumemi-frontend-engineer-codecheck-api.vercel.app/api/v1/prefectures`,
       {
         headers: { "X-API-KEY": process.env.REACT_APP_YUMEMI_API_KEY },
       }
diff --git a/src/tests/population.test.ts b/src/tests/population.test.ts
@@ -30,7 +30,7 @@ describe("fetchPopulation", () => {
 
     expect(result).toEqual(mockData);
     expect(mockedAxios.get).toHaveBeenCalledWith(
-      `${process.env.REACT_APP_YUMEMI_API_URL}/api/v1/population/composition/perYear?prefCode=${prefCode}`,
+      `https://yumemi-frontend-engineer-codecheck-api.vercel.app/api/v1/population/composition/perYear?prefCode=${prefCode}`,
       {
         headers: {
           "X-API-KEY": process.env.REACT_APP_YUMEMI_API_KEY!,
@@ -48,7 +48,7 @@ describe("fetchPopulation", () => {
       "Error fetching population data: Error: API Error"
     );
     expect(mockedAxios.get).toHaveBeenCalledWith(
-      `${process.env.REACT_APP_YUMEMI_API_URL}/api/v1/population/composition/perYear?prefCode=${prefCode}`,
+      `https://yumemi-frontend-engineer-codecheck-api.vercel.app/api/v1/population/composition/perYear?prefCode=${prefCode}`,
       {
         headers: {
           "X-API-KEY": process.env.REACT_APP_YUMEMI_API_KEY!,
diff --git a/src/tests/prefectures.test.ts b/src/tests/prefectures.test.ts
@@ -21,7 +21,7 @@ describe("fetchPrefectures", () => {
 
     expect(result).toEqual(mockData);
     expect(mockedAxios.get).toHaveBeenCalledWith(
-      `${process.env.REACT_APP_YUMEMI_API_URL}/api/v1/prefectures`,
+      `https://yumemi-frontend-engineer-codecheck-api.vercel.app/api/v1/prefectures`,
       {
         headers: { "X-API-KEY": process.env.REACT_APP_YUMEMI_API_KEY },
       }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ export const fetchPopulation = async (`
`6`	`6`	`): Promise<PopulationCategory[]> => {`
`7`	`7`	`try {`
`8`	`8`	`const response = await axios.get<PopulationResponse>(`
`9`		- `${process.env.REACT_APP_YUMEMI_API_URL}/api/v1/population/composition/perYear?prefCode=${prefCode}`,
	`9`	+ `https://yumemi-frontend-engineer-codecheck-api.vercel.app/api/v1/population/composition/perYear?prefCode=${prefCode}`,
`10`	`10`	`{`
`11`	`11`	`headers: {`
`12`	`12`	`"X-API-KEY": process.env.REACT_APP_YUMEMI_API_KEY!,`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import { Prefecture } from "../types/prefecture";`
`4`	`4`	`export const fetchPrefectures = async (): Promise<Prefecture[]> => {`
`5`	`5`	`try {`
`6`	`6`	`const response = await axios.get(`
`7`		- `${process.env.REACT_APP_YUMEMI_API_URL}/api/v1/prefectures`,
	`7`	+ `https://yumemi-frontend-engineer-codecheck-api.vercel.app/api/v1/prefectures`,
`8`	`8`	`{`
`9`	`9`	`headers: { "X-API-KEY": process.env.REACT_APP_YUMEMI_API_KEY },`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ describe("fetchPrefectures", () => {`
`21`	`21`
`22`	`22`	`expect(result).toEqual(mockData);`
`23`	`23`	`expect(mockedAxios.get).toHaveBeenCalledWith(`
`24`		- `${process.env.REACT_APP_YUMEMI_API_URL}/api/v1/prefectures`,
	`24`	+ `https://yumemi-frontend-engineer-codecheck-api.vercel.app/api/v1/prefectures`,
`25`	`25`	`{`
`26`	`26`	`headers: { "X-API-KEY": process.env.REACT_APP_YUMEMI_API_KEY },`
`27`	`27`	`}`