Merge remote-tracking branch 'upstream/main' into teller-p2-service

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,6 +4,7 @@ about: Create a report to help us improve
 title: ''
 labels: bug
 assignees: ''
+
 ---
 
 **Describe the bug**

.github/ISSUE_TEMPLATE/feature-request-or-improvement.md

@@ -1,12 +1,13 @@
 ---
-name: Feature request
-about: Suggest an idea for this project
+name: Feature request or improvement
+about: Suggest a new feature or improvement
 title: ''
 labels: ''
 assignees: ''
+
 ---
 
-**Is your feature request related to a problem? Please describe.**
+**Is your request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 **Describe the solution you'd like**

README.md

@@ -57,13 +57,14 @@ Then run the following yarn commands:
 
 ```
 yarn install
-yarn run dev:services
+yarn run dev:services:all
 yarn prisma:migrate:dev
 yarn prisma:seed
 yarn dev
 ```
 
 ## Contributing
+
 To contribute, please see our [contribution guide](https://github.com/maybe-finance/maybe/blob/main/CONTRIBUTING.md).
 
 ## High-priority issues
@@ -91,9 +92,9 @@ To pull market data in (for investments), you'll need a Polygon.io API key. You
 -   [Handling money](https://github.com/maybe-finance/maybe/wiki/Handling-Money)
 -   [REST API](https://github.com/maybe-finance/maybe/wiki/REST-API)
 
-
 ## Repo Activity
-![Repo Activity](https://repobeats.axiom.co/api/embed/7866c9790deba0baf63ca1688b209130b306ea4e.svg "Repobeats analytics image")
+
+![Repo Activity](https://repobeats.axiom.co/api/embed/7866c9790deba0baf63ca1688b209130b306ea4e.svg 'Repobeats analytics image')
 
 ## Credits
 

apps/server/src/app/lib/postmark.ts

@@ -1,6 +1,6 @@
 import { ServerClient } from 'postmark'
 import env from '../../env'
 
-const postmark = new ServerClient(env.NX_POSTMARK_API_TOKEN)
+const postmark = env.NX_POSTMARK_API_TOKEN ? new ServerClient(env.NX_POSTMARK_API_TOKEN) : undefined
 
 export default postmark

apps/server/src/env.ts

@@ -75,7 +75,7 @@ const envSchema = z.object({
 
     NX_POSTMARK_FROM_ADDRESS: z.string().default('account@maybe.co'),
     NX_POSTMARK_REPLY_TO_ADDRESS: z.string().default('support@maybe.co'),
-    NX_POSTMARK_API_TOKEN: z.string().default('REPLACE_THIS'),
+    NX_POSTMARK_API_TOKEN: z.string().optional(),
 })
 
 const env = envSchema.parse(process.env)

apps/workers/src/app/lib/postmark.ts

@@ -1,6 +1,6 @@
 import { ServerClient } from 'postmark'
 import env from '../../env'
 
-const postmark = new ServerClient(env.NX_POSTMARK_API_TOKEN)
+const postmark = env.NX_POSTMARK_API_TOKEN ? new ServerClient(env.NX_POSTMARK_API_TOKEN) : undefined
 
 export default postmark

apps/workers/src/env.ts

@@ -29,7 +29,7 @@ const envSchema = z.object({
 
     NX_POSTMARK_FROM_ADDRESS: z.string().default('account@maybe.co'),
     NX_POSTMARK_REPLY_TO_ADDRESS: z.string().default('support@maybe.co'),
-    NX_POSTMARK_API_TOKEN: z.string().default('REPLACE_THIS'),
+    NX_POSTMARK_API_TOKEN: z.string().optional(),
     NX_STRIPE_SECRET_KEY: z.string().default('sk_test_REPLACE_THIS'),
 
     NX_CDN_PRIVATE_BUCKET: z.string().default('REPLACE_THIS'),

libs/client/features/src/onboarding/steps/Profile.tsx

@@ -144,6 +144,7 @@ function ProfileForm({ title, onSubmit, defaultValues }: ProfileViewProps) {
                             <DatePicker
                                 popperPlacement="bottom"
                                 className="mt-2"
+                                minCalendarDate={DateTime.now().minus({ years: 100 }).toISODate()}
                                 error={error?.message}
                                 {...field}
                             />

libs/server/features/src/email/email.service.ts

@@ -22,7 +22,7 @@ export interface IEmailService {
 export class EmailService implements IEmailService {
     constructor(
         private readonly logger: Logger,
-        private readonly postmark: PostmarkServerClient,
+        private readonly postmark: PostmarkServerClient | undefined,
         private readonly defaultAddresses: { from: string; replyTo?: string }
     ) {}
 
@@ -85,6 +85,11 @@ export class EmailService implements IEmailService {
             message.TemplateModel
         )
 
+        if (!this.postmark) {
+            this.logger.info('Postmark API key not provided, skipping email send')
+            return undefined as unknown as MessageSendingResponse
+        }
+
         return await this.postmark.sendEmailWithTemplate(message)
     }
 
@@ -94,6 +99,11 @@ export class EmailService implements IEmailService {
             { text: message.TextBody, html: message.HtmlBody }
         )
 
+        if (!this.postmark) {
+            this.logger.info('Postmark API key not provided, skipping email send')
+            return undefined as unknown as MessageSendingResponse
+        }
+
         return await this.postmark.sendEmail(message)
     }
 
@@ -108,9 +118,13 @@ export class EmailService implements IEmailService {
 
         return (
             await Promise.all(
-                chunk(messages, 500).map((chunk) =>
-                    this.postmark.sendEmailBatchWithTemplates(chunk)
-                )
+                chunk(messages, 500).map((chunk) => {
+                    if (!this.postmark) {
+                        this.logger.info('Postmark API key not provided, skipping email send')
+                        return [] as MessageSendingResponse[]
+                    }
+                    return this.postmark.sendEmailBatchWithTemplates(chunk)
+                })
             )
         ).flat()
     }
@@ -124,7 +138,13 @@ export class EmailService implements IEmailService {
 
         return (
             await Promise.all(
-                chunk(messages, 500).map((chunk) => this.postmark.sendEmailBatch(chunk))
+                chunk(messages, 500).map((chunk) => {
+                    if (!this.postmark) {
+                        this.logger.info('Postmark API key not provided, skipping email send')
+                        return [] as MessageSendingResponse[]
+                    }
+                    return this.postmark.sendEmailBatch(chunk)
+                })
             )
         ).flat()
     }

package.json

@@ -5,7 +5,7 @@
     "scripts": {
         "dev": "nx run-many --target serve --projects=client,server,workers --parallel --host 0.0.0.0 --nx-bail=true --maxParallel=100",
         "dev:services": "COMPOSE_PROFILES=services docker-compose up -d",
-        "dev:services:all": "COMPOSE_PROFILES=services,ngrok,stripe docker-compose up",
+        "dev:services:all": "COMPOSE_PROFILES=services,ngrok docker-compose up -d",
         "dev:workers:test": "nx test workers --skip-nx-cache --runInBand",
         "dev:server:test": "nx test server --skip-nx-cache --runInBand",
         "dev:test:unit": "yarn dev:ci:test --testPathPattern='^(?!.*integration).*$' --verbose --skip-nx-cache",