Merge pull request #22 from nspalo/feature/BWA-8-weather-app-github-a…

…ction feature/BWA-8-weather-app-github-action
nspalo · Sep 11, 2023 · 0dfae7d · 0dfae7d
2 parents 755b99b + 14d697a
commit 0dfae7d
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 55 deletions.
diff --git a/.github/workflows/weather-app-ci-build.yml b/.github/workflows/weather-app-ci-build.yml
@@ -0,0 +1,63 @@
+name: Weather App CI
+
+on:
+  push:
+    branches: [ "master", "development" ]
+  pull_request:
+    branches: [ "master", "development" ]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Docker Login
+      env:
+        DOCKER_USER: ${{ secrets.DOCKER_USER }}
+        DOCKER_KEY: ${{ secrets.DOCKER_KEY }}
+      run: |
+        docker login -u $DOCKER_USER -p $DOCKER_KEY
+
+    # Script Permissions
+    - name: Add Permission to Shell Scripts
+      run: chmod +x -R ./scripts/*.sh
+
+    # Docker Images
+    - name: Building the Docker Images
+      run: ./scripts/build.sh
+
+    # Docker Containers
+    - name: Start Docker Containers
+      run: ./scripts/up.sh -d
+
+    # Composer 
+    - name: Run Composer
+      run: |
+        ./scripts/composer.sh install
+        ./scripts/composer.sh dump-autoload
+
+    # NPM
+    - name: Run NPM
+      run: |
+        ./scripts/run.sh npm install
+        ./scripts/run.sh npm run build
+
+    # Code Quality Check
+    - name: Run PhpStan
+      run: ./scripts/composer.sh run phpstan
+
+    - name: Run Easy Coding Sandards
+      run: ./scripts/composer.sh run ecs-all
+
+    - name: Run Automated Test with PhpUnit
+      run: ./scripts/composer.sh run phpunit
+
+    # Teardown
+    - name: Stop container and remove images
+      run: ./scripts/down.sh -v
+
+
+
diff --git a/src/composer.json b/src/composer.json
@@ -37,6 +37,7 @@
     },
     "scripts": {
         "post-autoload-dump": [
+            "mkdir -p ./bootstrap/cache/",
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover --ansi"
         ],

diff --git a/src/config/services.php b/src/config/services.php
@@ -37,7 +37,7 @@
             'max_output' => env('OPEN_WEATHER_MAX_OUTPUT', '5'),
             'unit' => env('OPEN_WEATHER_UNIT', 'metric'),
             'lang' => env('OPEN_WEATHER_LANG', 'en'),
-            'uri' => env('OPEN_WEATHER_API_URI', ''),
+            'uri' => env('OPEN_WEATHER_API_URI', 'api.openweathermap.org/data/2.5'),
         ],
         'geoapify' => [
             'filter' => env('GEOAPIFY_FILTER', 'countrycode:jp'),
@@ -46,7 +46,7 @@
             'lang' => env('GEOAPIFY_LANG', 'en'),
             'max_output' => env('GEOAPIFY_MAX_OUTPUT', '1'),
             'type' => env('GEOAPIFY_TYPE', 'city'),
-            'uri' => env('GEOAPIFY_API_URI', ''),
+            'uri' => env('GEOAPIFY_API_URI', 'api.geoapify.com/v1/geocode/search'),
             'default_search' => env('GEOAPIFY_DEFAULT', 'Tokyo, Japan'),
         ],
     ],

diff --git a/src/tests/Unit/CreatesApplication.php → src/tests/CreatesApplication.php b/src/tests/Unit/CreatesApplication.php → src/tests/CreatesApplication.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Unit;
+namespace Tests;
 
 use Illuminate\Contracts\Console\Kernel;
 
@@ -15,7 +15,7 @@ trait CreatesApplication
      */
     public function createApplication()
     {
-        $app = require __DIR__ . '/../../bootstrap/app.php';
+        $app = require __DIR__ . '/../bootstrap/app.php';
 
         $app->make(Kernel::class)->bootstrap();
 

diff --git a/src/tests/Feature/ExampleTest.php b/src/tests/Feature/ExampleTest.php
diff --git a/src/tests/Unit/TestCase.php → src/tests/TestCase.php b/src/tests/Unit/TestCase.php → src/tests/TestCase.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Unit;
+namespace Tests;
 
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
 

diff --git a/src/tests/Unit/Enums/DirectionTest.php b/src/tests/Unit/Enums/DirectionTest.php
@@ -5,7 +5,7 @@
 namespace Unit\Enums;
 
 use App\Enums\Direction;
-use Unit\TestCase;
+use Tests\TestCase;
 
 class DirectionTest extends TestCase
 {

diff --git a/src/tests/Unit/ExampleTest.php b/src/tests/Unit/ExampleTest.php
diff --git a/src/tests/Unit/Services/ConfigurationMapper/ServiceConfigurationMapperTest.php b/src/tests/Unit/Services/ConfigurationMapper/ServiceConfigurationMapperTest.php
@@ -6,7 +6,7 @@
 
 use App\Services\ConfigurationMapper\Exceptions\UnknownServiceConfigurationException;
 use App\Services\ConfigurationMapper\ServiceConfigurationMapper;
-use Unit\TestCase;
+use Tests\TestCase;
 
 class ServiceConfigurationMapperTest extends TestCase
 {

diff --git a/src/tests/Unit/Services/GeoapifyApi/GeocodingServiceTest.php b/src/tests/Unit/Services/GeoapifyApi/GeocodingServiceTest.php
@@ -9,7 +9,7 @@
 use App\Services\UrlQueryStringBuilder\Interfaces\UrlQueryStringBuilderServiceInterface;
 use Illuminate\Http\Client\RequestException;
 use Illuminate\Support\Facades\Http;
-use Unit\TestCase;
+use Tests\TestCase;
 
 class GeocodingServiceTest extends TestCase
 {

diff --git a/src/tests/Unit/Services/GeoapifyApi/Resources/GeolocationResourceTest.php b/src/tests/Unit/Services/GeoapifyApi/Resources/GeolocationResourceTest.php
@@ -5,7 +5,7 @@
 namespace Unit\Services\GeoapifyApi\Resources;
 
 use App\Services\GeoapifyApi\Resources\GeolocationResource;
-use Unit\TestCase;
+use Tests\TestCase;
 
 class GeolocationResourceTest extends TestCase
 {

diff --git a/src/tests/Unit/Services/OpenWeatherApi/Resources/WeatherResourceTest.php b/src/tests/Unit/Services/OpenWeatherApi/Resources/WeatherResourceTest.php
@@ -5,7 +5,7 @@
 namespace Unit\Services\OpenWeatherApi\Resources;
 
 use App\Services\OpenWeatherApi\Resources\WeatherResource;
-use Unit\TestCase;
+use Tests\TestCase;
 
 class WeatherResourceTest extends TestCase
 {

diff --git a/src/tests/Unit/Services/OpenWeatherApi/Resources/WeatherResourcesTest.php b/src/tests/Unit/Services/OpenWeatherApi/Resources/WeatherResourcesTest.php
@@ -5,7 +5,7 @@
 namespace Unit\Services\OpenWeatherApi\Resources;
 
 use App\Services\OpenWeatherApi\Resources\WeatherResources;
-use Unit\TestCase;
+use Tests\TestCase;
 
 class WeatherResourcesTest extends TestCase
 {

diff --git a/src/tests/Unit/Services/UrlQueryStringBuilder/UrlQueryStringBuilderServiceTest.php b/src/tests/Unit/Services/UrlQueryStringBuilder/UrlQueryStringBuilderServiceTest.php
@@ -5,7 +5,7 @@
 namespace Unit\Services\UrlQueryStringBuilder;
 
 use App\Services\UrlQueryStringBuilder\UrlQueryStringBuilderService;
-use Unit\TestCase;
+use Tests\TestCase;
 
 class UrlQueryStringBuilderServiceTest extends TestCase
 {