Merge pull request #732 from wmde/release/2023-11-01

Release Mismatch Finder to Production
wmde · Nov 2, 2023 · b98172c · b98172c
2 parents 12a5d32 + 6a75fb0
commit b98172c
Show file tree

Hide file tree

Showing 63 changed files with 1,250 additions and 632 deletions.
diff --git a/.github/workflows/deploy-app-staging.yml b/.github/workflows/deploy-app-staging.yml
@@ -3,16 +3,20 @@ name: Build and Deploy to staging on Toolforge
 on:
   push:
    branches:
-    - main
+    - development
     - staging/**
     - gh-actions/**
 
+concurrency:
+  group: '${{ github.workflow }}'
+  cancel-in-progress: true
+
 jobs:
   build-deploy:
     name: Ship and Deploy
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up node
       uses: actions/setup-node@v3.8.1
       with:

diff --git a/.github/workflows/deploy-app.yml b/.github/workflows/deploy-app.yml
@@ -4,14 +4,17 @@ on:
   push:
    branches:
     - main
-    - gh-actions/**
+
+concurrency:
+  group: '${{ github.workflow }}'
+  cancel-in-progress: true
 
 jobs:
   build-deploy:
     name: Ship and Deploy
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up node
       uses: actions/setup-node@v3.8.1
       with:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -6,7 +6,7 @@ jobs:
   phpcs-lint:
     runs-on: ubuntu-latest
     steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
 
         - name: Setup PHP
           uses: shivammathur/setup-php@v2
@@ -22,7 +22,7 @@ jobs:
   js-lint:
     runs-on: ubuntu-latest
     steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
 
         - name: Setup Node.js
           uses: actions/setup-node@v3.8.1

diff --git a/.github/workflows/schedule-release.yml b/.github/workflows/schedule-release.yml
@@ -0,0 +1,30 @@
+## Creates a PR from development to main every 2 weeks
+name: Release request from development to main
+
+on:
+  schedule:
+    - cron: '0 0 1,15 * *'
+  workflow_dispatch:
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: development
+      - name: Branch out Release
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "<>"
+          git branch release/$(date +'%Y-%m-%d')
+          git push -u origin release/$(date +'%Y-%m-%d')
+      - name: Create PR
+        run: |
+          gh pr create -B main -H release/$(date +'%Y-%m-%d') \
+          --title "Release Mismatch Finder to Production" \
+          --body "Review and release the latest changes."
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ jobs:
   feature-test:
     runs-on: ubuntu-latest
     steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
 
         - name: Setup PHP
           uses: shivammathur/setup-php@v2
@@ -28,7 +28,7 @@ jobs:
   js-test:
     runs-on: ubuntu-latest
     steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
 
         - name: Setup Node.js
           uses: actions/setup-node@v3.8.1
@@ -47,7 +47,7 @@ jobs:
     timeout-minutes: 30
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
 

diff --git a/.github/workflows/update-toc.yml b/.github/workflows/update-toc.yml
@@ -0,0 +1,17 @@
+name: Update Table of Contents (ToC)
+
+on: 
+  pull_request:
+    paths: 
+      - docs/**
+
+jobs:
+  generateTOC:
+    name: TOC Generator
+    runs-on: ubuntu-latest
+    steps:
+      - uses: technote-space/toc-generator@v4
+        with:
+          TARGET_PATHS: ./docs/*.md
+          CREATE_PR: true
+
diff --git a/README.md b/README.md
@@ -16,5 +16,5 @@ A tool to review mismatches between Wikidata and External Databases.
 * Follow [these instructions](docs/README.md#quickstart) to setup your local environment.
 * Start the application server with `sail up`
 * Stop the application server with `sail down`
-* Make sure to setup a local testing oauth consumer by following [these instructions](docs/README.md#oauth)
+* Make sure to setup a local testing oauth consumer by following [these instructions](docs/README.md#working-with-oauth)
 * If you encounter any issues, see the [troubleshooting section](docs/README.md#troubleshooting).
diff --git a/app/Jobs/ImportCSV.php b/app/Jobs/ImportCSV.php
@@ -49,6 +49,9 @@ public function handle(CSVImportReader $reader)
         DB::transaction(function () use ($reader, $filepath) {
             $reader->lines($filepath)->each(function ($mismatchLine) {
                 $mismatch = Mismatch::make($mismatchLine);
+                if ($mismatch->type == null) {
+                    $mismatch->type = 'statement';
+                }
                 $mismatch->importMeta()->associate($this->meta);
                 $mismatch->save();
             });

diff --git a/app/Jobs/ValidateCSV.php b/app/Jobs/ValidateCSV.php
@@ -136,6 +136,10 @@ private function checkFieldErrors($mismatch): ?string
                 'prohibited_if:wikidata_value,',
                 'max:' . $rules['meta_wikidata_value']['max_length'],
                 'regex:' . $rules['meta_wikidata_value']['format']
+            ],
+            'type' => [
+                'string',
+                'in:' . implode(',', $rules['type']['accepted_values']),
             ]
         ]);
 

diff --git a/app/Models/Mismatch.php b/app/Models/Mismatch.php
@@ -22,7 +22,8 @@ class Mismatch extends Model
         'meta_wikidata_value',
         'external_value',
         'external_url',
-        'review_status'
+        'review_status',
+        'type'
     ];
 
     /**
@@ -31,7 +32,8 @@ class Mismatch extends Model
      * @var array
      */
     protected $attributes = [
-        'review_status' => 'pending'
+        'review_status' => 'pending',
+        'type' => 'statement'
     ];
 
     public function importMeta()

diff --git a/composer.json b/composer.json
@@ -9,23 +9,23 @@
         "ext-zip": "*",
         "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.2.0",
-        "guzzlehttp/guzzle": "^7.6.1",
-        "inertiajs/inertia-laravel": "0.6.9",
-        "kevinrob/guzzle-cache-middleware": "^4.0.2",
+        "guzzlehttp/guzzle": "^7.8",
+        "inertiajs/inertia-laravel": "^0.6.10",
+        "kevinrob/guzzle-cache-middleware": "^4.1.2",
         "laravel/framework": "^8.83.26",
         "laravel/sanctum": "^2.15.1",
-        "laravel/socialite": "^5.5.6",
-        "laravel/tinker": "^2.7.3",
+        "laravel/socialite": "^5.9",
+        "laravel/tinker": "^2.8",
         "taavi/laravel-socialite-mediawiki": "^1.4"
     },
     "require-dev": {
         "facade/ignition": "^2.17.7",
         "fakerphp/faker": "^1.20.0",
         "laravel/dusk": "^6.25.1",
-        "laravel/sail": "^1.19.0",
-        "mockery/mockery": "^1.5.0",
+        "laravel/sail": "^1.19",
+        "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^5.11",
-        "phpunit/phpunit": "^9.6.8",
+        "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3.7.2",
         "timacdonald/log-fake": "^1.9"
     },