Merge pull request #8 from crab85193/develop

API URLを直指定して本番環境でのundefined問題を解消
crab85193 · Dec 18, 2024 · 56cd257 · 56cd257
2 parents 137b795 + d68ce65
commit 56cd257
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
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 },
       }