Skip to content

Commit 7c6217e

Browse files
csiyangcsiyang
authored
Merge branch 'main' into feature/25-00-NC-feat-church-invites
2 parents 8cee2e8 + 67b5f7e commit 7c6217e

File tree

112 files changed

+1143
-2218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1143
-2218
lines changed

‎.github/workflows/api-deploy-worker.yml‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ jobs:
4747
with:
4848
fetch-depth: 0
4949
- uses: nrwl/nx-set-shas@v4
50-
- uses: useblacksmith/setup-node@v5
50+
51+
- name: Setup Node.js
52+
uses: useblacksmith/setup-node@v5
5153
with:
5254
node-version: ${{ matrix.node-version }}
5355

@@ -67,29 +69,16 @@ jobs:
6769
path: ./node_modules
6870
- name: NPM Install
6971
run: npm install --silent
70-
71-
- name: nx Install
72-
run: npm install -g nx --silent
73-
7472
- name: Get affected apps
7573
run: |
7674
echo "apps=$(npx ts-node tools/scripts/affected-apps.ts --projects apis/api-*)" >> $GITHUB_OUTPUT
7775
cat $GITHUB_OUTPUT
7876
id: affected-apps
79-
80-
- name: Has Prisma
81-
id: has_prisma
82-
uses: andstor/file-existence-action@v3
83-
with:
84-
files: 'apis/${{inputs.name}}/db/schema.prisma'
85-
86-
- name: Prisma Migrate
87-
if: steps.has_prisma.outputs.files_exists == 'true' && contains(steps.affected-apps.outputs.apps, inputs.name)
77+
- name: Prisma Generate
78+
if: contains(steps.affected-apps.outputs.apps, inputs.name)
8879
uses: mansagroup/nrwl-nx-action@v3
8980
with:
9081
targets: prisma-generate
91-
projects: ${{ inputs.name }}
92-
parallel: 1
9382
env:
9483
DISABLE_ERD: true
9584
- name: Build ${{ inputs.name }}
@@ -102,6 +91,7 @@ jobs:
10291

10392
# ECS Deployment
10493
- name: Configure ECS AWS credentials
94+
if: contains(steps.affected-apps.outputs.apps, inputs.name)
10595
uses: aws-actions/configure-aws-credentials@v4
10696
with:
10797
aws-access-key-id: ${{ secrets.JFP_AWS_ACCESS_KEY_ID }}
@@ -142,5 +132,6 @@ jobs:
142132
aws ecs update-service --force-new-deployment --service $ECS_SERVICE --cluster $ECS_CLUSTER
143133
144134
- name: Update Hive managed subgraph
135+
if: contains(steps.affected-apps.outputs.apps, inputs.name)
145136
run: |
146137
npx hive schema:publish apis/${{ inputs.name }}/schema.graphql --service ${{ inputs.name }} --url ${{ inputs.endpoint_url }} --github

‎.github/workflows/api-gateway-prod-worker.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
- uses: useblacksmith/setup-node@v5
2929
with:
3030
node-version: ${{ matrix.node-version }}
31-
3231
- name: Get Node Version
3332
id: node-version
3433
run: echo "version=$(node -v)" >> $GITHUB_OUTPUT
@@ -44,8 +43,8 @@ jobs:
4443
key: ${{ github.repository }}-${{ steps.node-version.outputs.version }}-node-modules
4544
path: ./node_modules
4645

47-
- name: nx Install
48-
run: npm install -g nx --silent
46+
- name: NPM Install
47+
run: npm install --silent
4948

5049
- name: Get affected apps
5150
run: |

‎.github/workflows/api-gateway-stage-worker.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
- uses: useblacksmith/setup-node@v5
2929
with:
3030
node-version: ${{ matrix.node-version }}
31-
3231
- name: Get Node Version
3332
id: node-version
3433
run: echo "version=$(node -v)" >> $GITHUB_OUTPUT
@@ -44,15 +43,13 @@ jobs:
4443
key: ${{ github.repository }}-${{ steps.node-version.outputs.version }}-node-modules
4544
path: ./node_modules
4645

47-
- name: nx Install
48-
run: npm install -g nx --silent
49-
46+
- name: NPM Install
47+
run: npm install --silent
5048
- name: Get affected apps
5149
run: |
5250
echo "apps=$(npx ts-node tools/scripts/affected-apps.ts --projects apis/api-*)" >> $GITHUB_OUTPUT
5351
cat $GITHUB_OUTPUT
5452
id: affected-apps
55-
5653
#ECS Deployment
5754
- name: Configure ECS AWS credentials
5855
if: contains(steps.affected-apps.outputs.apps, 'api-gateway')

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,8 @@ jobs:
1515
strategy:
1616
matrix:
1717
node-version: [22]
18-
services:
19-
postgres:
20-
image: postgres
21-
env:
22-
POSTGRES_PASSWORD: postgres
23-
options: >-
24-
--health-cmd pg_isready
25-
--health-interval 10s
26-
--health-timeout 5s
27-
--health-retries 5
28-
ports:
29-
- 5432:5432
18+
env:
19+
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
3020
steps:
3121
- uses: actions/checkout@v4
3222
with:
@@ -61,11 +51,7 @@ jobs:
6151
env:
6252
DISABLE_ERD: true
6353
- name: Install Doppler
64-
run: |
65-
sudo apt-get update && sudo apt-get install -y apt-transport-https ca-certificates curl gnupg
66-
curl -sLf --retry 3 --tlsv1.2 --proto "=https" 'https://packages.doppler.com/public/cli/gpg.DE2A7741A397C129.key' | sudo apt-key add -
67-
echo "deb https://packages.doppler.com/public/cli/deb/debian any-version main" | sudo tee /etc/apt/sources.list.d/doppler-cli.list
68-
sudo apt-get update && sudo apt-get -y install doppler
54+
uses: dopplerhq/cli-action@v3
6955
- name: fetch-secrets and build
7056
uses: mansagroup/nrwl-nx-action@v3
7157
env:
@@ -97,18 +83,8 @@ jobs:
9783
node-version: [22]
9884
# https://jestjs.io/docs/cli#--shard
9985
shard: ['1/3', '2/3', '3/3']
100-
services:
101-
postgres:
102-
image: postgres
103-
env:
104-
POSTGRES_PASSWORD: postgres
105-
options: >-
106-
--health-cmd pg_isready
107-
--health-interval 10s
108-
--health-timeout 5s
109-
--health-retries 5
110-
ports:
111-
- 5432:5432
86+
env:
87+
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
11288
steps:
11389
- uses: actions/checkout@v4
11490
with:

‎apis/api-gateway/infrastructure/locals.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ locals {
1515
container_port = local.port
1616
host_port = local.port
1717
cpu = 1024
18-
memory = 2048
19-
desired_count = 1
18+
memory = 4096
19+
desired_count = 2
2020
zone_id = var.ecs_config.zone_id
2121
alb_target_group = merge(var.ecs_config.alb_target_group, {
2222
port = local.port
2323
})
2424
auto_scaling = {
2525
max_capacity = 4
26-
min_capacity = 1
26+
min_capacity = 2
2727
cpu = {
2828
target_value = 75
2929
}

‎apis/api-gateway/schema.graphql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2922,11 +2922,11 @@ union MutationSiteCreateResult @join__type(graph: API_ANALYTICS) @join__unionMe
29222922

29232923
union MediaVideo @join__type(graph: API_JOURNEYS_MODERN) @join__unionMember(graph: API_JOURNEYS_MODERN, member: "MuxVideo") @join__unionMember(graph: API_JOURNEYS_MODERN, member: "Video") @join__unionMember(graph: API_JOURNEYS_MODERN, member: "YouTube") = MuxVideo | Video | YouTube
29242924

2925-
union MutationShortLinkCreateResult @join__type(graph: API_MEDIA) @join__unionMember(graph: API_MEDIA, member: "ZodError") @join__unionMember(graph: API_MEDIA, member: "NotUniqueError") @join__unionMember(graph: API_MEDIA, member: "MutationShortLinkCreateSuccess") = ZodError | NotUniqueError | MutationShortLinkCreateSuccess
2925+
union MutationShortLinkCreateResult @join__type(graph: API_MEDIA) @join__unionMember(graph: API_MEDIA, member: "NotUniqueError") @join__unionMember(graph: API_MEDIA, member: "ZodError") @join__unionMember(graph: API_MEDIA, member: "MutationShortLinkCreateSuccess") = NotUniqueError | ZodError | MutationShortLinkCreateSuccess
29262926

29272927
union MutationShortLinkDeleteResult @join__type(graph: API_MEDIA) @join__unionMember(graph: API_MEDIA, member: "NotFoundError") @join__unionMember(graph: API_MEDIA, member: "MutationShortLinkDeleteSuccess") = NotFoundError | MutationShortLinkDeleteSuccess
29282928

2929-
union MutationShortLinkDomainCreateResult @join__type(graph: API_MEDIA) @join__unionMember(graph: API_MEDIA, member: "ZodError") @join__unionMember(graph: API_MEDIA, member: "NotUniqueError") @join__unionMember(graph: API_MEDIA, member: "MutationShortLinkDomainCreateSuccess") = ZodError | NotUniqueError | MutationShortLinkDomainCreateSuccess
2929+
union MutationShortLinkDomainCreateResult @join__type(graph: API_MEDIA) @join__unionMember(graph: API_MEDIA, member: "NotUniqueError") @join__unionMember(graph: API_MEDIA, member: "ZodError") @join__unionMember(graph: API_MEDIA, member: "MutationShortLinkDomainCreateSuccess") = NotUniqueError | ZodError | MutationShortLinkDomainCreateSuccess
29302930

29312931
union MutationShortLinkDomainDeleteResult @join__type(graph: API_MEDIA) @join__unionMember(graph: API_MEDIA, member: "NotFoundError") @join__unionMember(graph: API_MEDIA, member: "ForeignKeyConstraintError") @join__unionMember(graph: API_MEDIA, member: "MutationShortLinkDomainDeleteSuccess") = NotFoundError | ForeignKeyConstraintError | MutationShortLinkDomainDeleteSuccess
29322932

‎apis/api-journeys-modern/src/schema/journey/simple/simplifyJourney.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ export function simplifyJourney(
2424
)
2525

2626
const card: JourneySimpleCard = {
27-
id: `card-${index + 1}`
27+
id: `card-${index + 1}`,
28+
x: stepBlock.x ?? 0,
29+
y: stepBlock.y ?? 0
2830
}
2931

3032
const headingBlock = childBlocks.find(

0 commit comments

Comments
 (0)