Skip to content

Commit bd79f49

Browse files
authored
Merge pull request #103 from nossas/hotfix/optimized-email-send
Correção do Bug de envio de emails otimizados
2 parents 0ab607b + 287733f commit bd79f49

File tree

4 files changed

+21
-8
lines changed

4 files changed

+21
-8
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919

2020
jobs:
2121
build:
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-latest
2323
environment: ${{ inputs.environment }}
2424
outputs:
2525
tags: ${{ steps.meta.outputs.tags }}

.github/workflows/publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ on:
88
tags:
99
- v*
1010
jobs:
11-
tests:
12-
name: Tests for all apis and libs
13-
uses: ./tests.yml
11+
# tests:
12+
# name: Tests for all apis and libs
13+
# uses: ./.github/workflows/tests.yml
1414

1515
build:
1616
name: Build apis endpoints
17-
uses: ./build.yml
17+
uses: ./.github/workflows/build.yml
1818
# with:
1919
# environment: staging
2020
secrets:

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: pnpm test
4343

4444
- name: Wait before uploading coverage
45-
run: sleep 30s
45+
run: sleep 30s
4646

4747
- name: Upload coverage to Codecov
4848
uses: codecov/codecov-action@v2

packages/activists-api/src/resolvers/create_email_pressure.ts

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export type PressureAction = {
99
targets_id?: string
1010
email_subject?: string
1111
email_body?: string
12+
subject_list?: string[]
1213
token: string
1314
form_data?: any
1415
}
@@ -63,6 +64,7 @@ export const create_email_pressure = async ({ widget, activist, action }: IBaseA
6364
pressure_subject: pressureSubject,
6465
pressure_body: pressureBody,
6566
pressure_type: pressureType,
67+
subject_list: subjectList,
6668
batch_limit = 100,
6769
mail_limit = 1000,
6870
optimization_enabled = true
@@ -122,6 +124,17 @@ export const create_email_pressure = async ({ widget, activist, action }: IBaseA
122124
form_data
123125
}
124126

127+
// FUNÇÃO AUXILIAR PARA OBTER O ASSUNTO
128+
const getEmailSubject = (): string => {
129+
if (subjectList && subjectList.length > 0) {
130+
const randomIndex = Math.floor(Math.random() * subjectList.length);
131+
return subjectList[randomIndex];
132+
}
133+
134+
// Fallback para o assunto único
135+
return emailSubject || group?.email_subject || pressureSubject;
136+
};
137+
125138
if (optimization_enabled) {
126139
// Pressão otimizado foi habilitada
127140
const pressureInfo = await ActionsAPI.get_pressure_info(widget.id);
@@ -169,7 +182,7 @@ export const create_email_pressure = async ({ widget, activist, action }: IBaseA
169182
activist,
170183
targets,
171184
emailBody: optimziedBody,
172-
emailSubject: group?.email_subject || pressureSubject,
185+
emailSubject: getEmailSubject(),
173186
});
174187

175188
logger.child({ id, created_at }).info('ActionsAPI');
@@ -208,7 +221,7 @@ export const create_email_pressure = async ({ widget, activist, action }: IBaseA
208221
activist,
209222
targets,
210223
emailBody: emailBody || group?.email_body || pressureBody,
211-
emailSubject: emailSubject || group?.email_subject || pressureSubject
224+
emailSubject: getEmailSubject()
212225
});
213226
// Cria a pressão na base de dados
214227
const { id, created_at } = await ActionsAPI.pressure({

0 commit comments

Comments
 (0)