Skip to content

Commit 18bf6d2

Browse files
ninom5ninom5
authored
delete redundant controller (#257)
* delete redundant controller * fix?
1 parent 84468ab commit 18bf6d2

File tree

6 files changed

+20
-52
lines changed

6 files changed

+20
-52
lines changed

‎apps/api/prisma/schema.prisma‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ model Email {
155155
internId String
156156
emailRecipient Intern @relation(fields: [internId], references: [id])
157157
createdAt DateTime @default(now())
158-
lastUpdatedAt DateTime @updatedAt
158+
updatedAt DateTime @updatedAt
159159
}
160160

161161
model InternshipApplicationStatus {

‎apps/api/src/email/email.controller.ts‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,25 +45,10 @@ export class EmailController {
4545
return templates;
4646
}
4747

48-
@Get('image')
49-
async getImage(@Query('emailId') emailId: string, @Res() res: Response) {
48+
@Get('logo')
49+
async getImageLogo(@Query('emailId') emailId: string, @Res() res: Response) {
5050
await this.emailService.updateIsSeen(emailId);
5151

52-
const pixel: Buffer = Buffer.from(
53-
'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwADfgH+WBwLfwAAAABJRU5ErkJggg==',
54-
'base64',
55-
);
56-
57-
res.writeHead(200, {
58-
'Content-Type': 'image/png',
59-
'Content-Length': pixel.length,
60-
});
61-
62-
res.end(pixel);
63-
}
64-
65-
@Get('logo')
66-
async getImageLogo(@Res() res: Response) {
6752
const imagePath = join(
6853
process.cwd(),
6954
'apps',

‎apps/api/src/email/email.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export class EmailService {
4747
(email) => email.internId === intern.id,
4848
).id;
4949

50-
const trackImage = `<img src="https://internship.dump.hr/api/email/image?emailId=${emailId}" width="1" height="1" style="display:none" />`;
50+
const trackImage = `<img src="https://internship.dump.hr/api/email/logo?emailId=${emailId}" width="1" height="1" style="display:none" />`;
5151

5252
return this.postmark.sendEmail({
5353
From: 'info@dump.hr',

‎apps/api/src/intern/intern.service.ts‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -242,13 +242,6 @@ export class InternService {
242242
243243
Link: https://bit.ly/primjer-inicijalnog`;
244244

245-
const trackImage = `<img src="https://internship.dump.hr/api/email/image?emailId=${emailId}" width="1" height="1" style="display:none" />`;
246-
247-
const generalTextEnding = `Lijep pozdrav,
248-
249-
DUMP Udruga mladih programera
250-
dump.hr ${trackImage}`;
251-
252245
let fullGeneralText = generalTextBody;
253246

254247
if (internToCreate.disciplines.includes(Discipline.Marketing))
@@ -276,7 +269,7 @@ export class InternService {
276269
<table role="presentation" border="0" cellpadding="0" cellspacing="0" width="600" style="background:#ffffff; border-radius:8px; box-shadow:0 2px 6px rgba(0,0,0,0.1); overflow:hidden;">
277270
<tr>
278271
<td align="center" style="padding:20px;">
279-
<img src="https://internship.dump.hr/api/email/logo" alt="DUMP Logo" width="180" />
272+
<img src="https://internship.dump.hr/api/email/logo?emailId=${emailId}" alt="DUMP Logo" width="180" />
280273
</td>
281274
</tr>
282275
<tr>
@@ -295,7 +288,6 @@ export class InternService {
295288
</td>
296289
</tr>
297290
</table>
298-
${trackImage}
299291
</body>
300292
</html>
301293
`,

‎apps/api/src/interview-slot/interview-slot.service.ts‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -273,27 +273,25 @@ export class InterviewSlotService {
273273

274274
const emailId = createdEmail.id;
275275

276-
const trackImage = `<img src="https://internship.dump.hr/api/email/image?emailId=${emailId}" width="1" height="1" style="display:none" />`;
277-
278276
const emailText = `
279-
Pozdrav ${intern.firstName},<br/><br/>
277+
Pozdrav ${intern.firstName},<br/><br/>
280278
281-
biranje termina intervjua je uspješno provedeno!<br/>
282-
Termin svog intervjua možeš vidjeti na status stranici:<br/>
283-
<a href="https://internship.dump.hr/status/${intern.id}" style="color:#007BFF; text-decoration:none;">https://internship.dump.hr/status/${intern.id}</a><br/><br/>
279+
biranje termina intervjua je uspješno provedeno!<br/>
280+
Termin svog intervjua možeš vidjeti na status stranici:<br/>
281+
<a href="https://internship.dump.hr/status/${intern.id}" style="color:#007BFF; text-decoration:none;">https://internship.dump.hr/status/${intern.id}</a><br/><br/>
284282
285-
U slučaju da ipak ne možeš doći na odabrani termin, javi nam se na vrijeme na
286-
<a href="mailto:info@dump.hr" style="color:#007BFF; text-decoration:none;">info@dump.hr</a>.<br/><br/>
283+
U slučaju da ipak ne možeš doći na odabrani termin, javi nam se na vrijeme na
284+
<a href="mailto:info@dump.hr" style="color:#007BFF; text-decoration:none;">info@dump.hr</a>.<br/><br/>
287285
288-
<b>Podsjećamo:</b><br/>
289-
Tvoj intervju će se održati u odabranom terminu u našem uredu (prostorija <b>A223</b>) na FESB-u (Ruđera Boškovića 32).<br/><br/>
286+
<b>Podsjećamo:</b><br/>
287+
Tvoj intervju će se održati u odabranom terminu u našem uredu (prostorija <b>A223</b>) na FESB-u (Ruđera Boškovića 32).<br/><br/>
290288
291-
<b>Kako doći:</b><br/>
292-
Kad uđeš kroz glavna vrata FESB-a skreni desno do kraja hodnika (put referade) dok ne dođeš do stepenica s lijeve strane.
293-
Popni se na prvi kat, skreni lijevo i nastavi hodnikom do kraja – s desne strane vidjet ćeš vrata našeg ureda (A223).<br/><br/>
289+
<b>Kako doći:</b><br/>
290+
Kad uđeš kroz glavna vrata FESB-a skreni desno do kraja hodnika (put referade) dok ne dođeš do stepenica s lijeve strane.
291+
Popni se na prvi kat, skreni lijevo i nastavi hodnikom do kraja – s desne strane vidjet ćeš vrata našeg ureda (A223).<br/><br/>
294292
295-
Vidimo se!
296-
`;
293+
Vidimo se!
294+
`;
297295

298296
this.postmark.sendEmail({
299297
From: 'info@dump.hr',
@@ -311,11 +309,10 @@ Vidimo se!
311309
<table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
312310
<tr>
313311
<td align="center" style="padding:20px 0;">
314-
<!-- Container -->
315312
<table role="presentation" border="0" cellpadding="0" cellspacing="0" width="600" style="background:#ffffff; border-radius:8px; box-shadow:0 2px 6px rgba(0,0,0,0.1); overflow:hidden;">
316313
<tr>
317314
<td align="center" style="padding:20px;">
318-
<img src="https://internship.dump.hr/api/email/logo" alt="DUMP Logo" width="180" />
315+
<img src="https://internship.dump.hr/api/email/logo?emailId=${emailId}" alt="DUMP Logo" width="180" />
319316
</td>
320317
</tr>
321318
<tr>
@@ -334,7 +331,6 @@ Vidimo se!
334331
</td>
335332
</tr>
336333
</table>
337-
${trackImage}
338334
</body>
339335
</html>
340336
`,

‎apps/api/src/test-slot/test-slot.service.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,6 @@ export class TestSlotService {
206206
);
207207
const emailId = createdEmail.id;
208208

209-
const trackImage = `<img src="https://internship.dump.hr/api/email/image?emailId=${emailId}" width="1" height="1" style="display:none" />`;
210-
211209
await this.postmark.sendEmail({
212210
From: 'info@dump.hr',
213211
To: intern.email,
@@ -224,12 +222,10 @@ export class TestSlotService {
224222
<table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
225223
<tr>
226224
<td align="center" style="padding:20px 0;">
227-
<!-- Container -->
228225
<table role="presentation" border="0" cellpadding="0" cellspacing="0" width="600" style="background:#ffffff; border-radius:8px; box-shadow:0 2px 6px rgba(0,0,0,0.1); overflow:hidden;">
229226
<tr>
230227
<td align="center" style="padding:20px;">
231-
<!-- LOGO Placeholder -->
232-
<img src="https://internship.dump.hr/api/email/logo" alt="DUMP Logo" width="180" />
228+
<img src="https://internship.dump.hr/api/email/logo?emailId=${emailId}" alt="DUMP Logo" width="180" />
233229
</td>
234230
</tr>
235231
<tr>
@@ -274,7 +270,6 @@ export class TestSlotService {
274270
</td>
275271
</tr>
276272
</table>
277-
${trackImage}
278273
</body>
279274
</html>
280275
`,

0 commit comments

Comments
 (0)