Skip to content

fix: 参拝時の exp 二重加算を修正 #115

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.

Sign up for GitHub

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

Merged
cursor merged 2 commits into from
Jun 30, 2026
Merged

fix: 参拝時の exp 二重加算を修正 #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52874f4
ci: GitHub Actions のアクションを新バージョンへ更新し actionlint を通す
cursoragent Jun 30, 2026
e18cb70
fix(functions): 参拝時の exp 二重加算を修正
cursoragent Jun 30, 2026
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
10 changes: 5 additions & 5 deletions .github/workflows/dev-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run actionlint
shell: bash
Expand All @@ -22,12 +22,12 @@ jobs:
./actionlint -color

- name: setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "18"

- name: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down Expand Up @@ -61,15 +61,15 @@ jobs:
run: |
set -ex
echo "${{ secrets.DEV_GCLOUD_SERVICE_KEY }}" | base64 -d > ${{ env.GCP_KEY_PATH }}
- uses: 'google-github-actions/auth@v1'
- uses: 'google-github-actions/auth@v2'
with:
credentials_json: '${{ secrets.DEV_GCLOUD_SERVICE_KEY }}'

- name: 'Use gcloud CLI'
run: 'gcloud auth list --filter=status:ACTIVE --format="value(account)"'

- name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v1'
uses: 'google-github-actions/setup-gcloud@v2'
with:
install_components: ''
project_id: 'd-shrine-dev'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/prod-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
deploy:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run actionlint
shell: bash
Expand All @@ -22,12 +22,12 @@ jobs:
./actionlint -color

- name: setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: "18"

- name: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down Expand Up @@ -64,14 +64,14 @@ jobs:
run: |
set -ex
echo "${{ secrets.PROD_GCLOUD_SERVICE_KEY }}" | base64 -d > ${{ env.GCP_KEY_PATH }}
- uses: 'google-github-actions/auth@v1'
- uses: 'google-github-actions/auth@v2'
with:
credentials_json: '${{ secrets.PROD_GCLOUD_SERVICE_KEY }}'
- name: 'Use gcloud CLI'
run: 'gcloud auth list --filter=status:ACTIVE --format="value(account)"'

- name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v1'
uses: 'google-github-actions/setup-gcloud@v2'
with:
install_components: ''
project_id: 'd-shrine'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
actions-test:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run actionlint
shell: bash
Expand All @@ -22,15 +22,15 @@ jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "18"

- name: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
6 changes: 3 additions & 3 deletions app/functions/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,10 +995,10 @@ exports.sanpai = functions.https.onRequest(async(request, response) => {
msg = "2022/1/1〜2022/1/3はポイント3倍！"
}

// 更新
// 参拝可能時間のロックのため last_sanpai を先に確定させる
// (exp/status は計算後の下の update でまとめて反映する)
await userRef.update({
last_sanpai: FieldValue.serverTimestamp(),
exp: FieldValue.increment(add_exp)
last_sanpai: FieldValue.serverTimestamp()
})
const sanpai_logsRef = userRef.collection("sanpai_logs")
const sanpaiRes = await sanpai_logsRef.add({
Expand Down
Loading