Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,11 @@ Usamos `drizzle` y `drizzle-kit` para manejar conexiones a la BDD, que genera au

> AKA. Crea o edita Tablas, Columnas, Indices, etc.

Primero, necesitas actualizar el archivo del esquema en `./src/datasources/db/schema/tables.ts`. (o )
Primero, necesitas actualizar el archivo del esquema en `./src/workers/db_service/schema/tables.ts`. (o )
Este archivo define la estructura de las tablas en la BDD.

> Las relaciones entre tablas, se definen en `./src/datasources/db/schema/relations.ts`.
> Los esquemas de query/update se definen en `./src/datasources/db/schema/CRUD.ts`.
> Las relaciones entre tablas, se definen en `./src/workers/db_service/schema/relations.ts`.
> Los esquemas de query/update se definen en `./src/workers/db_service/schema/CRUD.ts`.

Para definir una tabla, utilizas la función `pgTable()`, donde el primer argumento es el nombre de la tabla y el segundo es un objeto que define los campos de la tabla.

Expand Down
2 changes: 1 addition & 1 deletion drizzle.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if (!process.env.NEON_URL) {

export default defineConfig({
dialect: "postgresql",
schema: "./src/datasources/db/schema.ts",
schema: "./src/workers/db_service/schema.ts",
out: "./drizzle/migrations",
breakpoints: true,
strict: true,
Expand Down
2 changes: 1 addition & 1 deletion drizzle/dbml.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { resolve } from "node:path";

import { pgGenerate } from "drizzle-dbml-generator";

import * as schema from "~/datasources/db/schema";
import * as schema from "~workers/db_service/db/schema";

const out = resolve(__dirname, "./schema.dbml");
const relational = true;
Expand Down
4 changes: 1 addition & 3 deletions emails/templates/iacamp/postulation-with-team.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ export const AIHackathonPostulationWithTeamEmail = ({ name }: Props) => {
selección.
</Text>

<Text className="text-xl mb-8">
¡Éxitos en la postulación!
</Text>
<Text className="text-xl mb-8">¡Éxitos en la postulación!</Text>

<Text className="text-xl">
Un saludo,
Expand Down
19 changes: 11 additions & 8 deletions emails/templates/iacamp/waitlist.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ export const IACampWaitlist = ({ nombre }: AddedToWaitlist) => {
</Text>

<Text className="text-center mb-8">
<Button
href="https://www.youtube.com/live/RSNRrqbLR84?si=DnG257y3MyWDppbi"
className="bg-blue-800 py-4 px-6 rounded-md text-gray-200 self-center"
target="_blank"
>
Entrar al Webinar
</Button>
<Button
href="https://www.youtube.com/live/RSNRrqbLR84?si=DnG257y3MyWDppbi"
className="bg-blue-800 py-4 px-6 rounded-md text-gray-200 self-center"
target="_blank"
>
Entrar al Webinar
</Button>
</Text>

<Text className="text-xl mb-8">
Expand All @@ -61,7 +61,10 @@ export const IACampWaitlist = ({ nombre }: AddedToWaitlist) => {
para no olvidarlo.
</Text>

<Text className="text-xl">Un saludo,<br/> Equipo CommunityOS</Text>
<Text className="text-xl">
Un saludo,
<br /> Equipo CommunityOS
</Text>
<Text className="text-xl mb-8"></Text>
</Section>
<Hr className="my-8" />
Expand Down
2 changes: 1 addition & 1 deletion migrate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { neon } from "@neondatabase/serverless";
import { config } from "dotenv";

import { runMigration } from "~/datasources/db/runMigrations";
import { runMigration } from "~workers/db_service/runMigrations";
import { defaultLogger } from "~/logging";

config({ path: process.cwd() + "/.dev.vars", override: true });
Expand Down
94 changes: 77 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
"prettier:ci": "prettier ./src --cache --check",
"prettier:fix": "prettier ./src --cache --write",
"typecheck": "tsc",
"dev": "wrangler dev --log-level info",
"dev:api": "wrangler dev --log-level info",
"dev:db": "wrangler dev --log-level info --config ./workers/db_service/wrangler.toml",
"dev": "concurrently --kill-others-on-fail \"npm run dev:api\" \"npm run dev:db\"",
"dev:wall-of-fame": "wrangler dev --test-scheduled --config ./workers/wall_of_fame_cron/wrangler.toml",
"dev:sanity": "wrangler dev --test-scheduled --config ./workers/sanity_asset_importer/wrangler.toml",
"dev:auth": "wrangler dev --test-scheduled --config ./workers/auth_tokens/wrangler.toml",
Expand Down Expand Up @@ -86,6 +88,7 @@
"@sanity/client": "^6.7.0",
"@tsndr/cloudflare-worker-jwt": "^2.5.3",
"@types/react": "^18.2.22",
"concurrently": "^8.2.2",
"cookie": "^0.5.0",
"dataloader": "^2.2.2",
"date-fns": "^3.6.0",
Expand All @@ -100,10 +103,10 @@
"hono": "^3.9.0",
"mercadopago": "^2.0.9",
"p-map": "^6.0.0",
"pg": "^8.11.5",
"pg": "^8.12.0",
"pino": "^9.2.0",
"pino-pretty": "^11.2.1",
"postgres": "^3.4.3",
"postgres": "^3.4.4",
"react": "^18.2.0",
"resend": "^3.3.0",
"slugify": "^1.6.6",
Expand Down
6 changes: 3 additions & 3 deletions src/authn/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import { decode, verify } from "@tsndr/cloudflare-worker-jwt";
import { Logger } from "pino";

import { TokenPayload } from "~/authn/types";
import { ORM_TYPE } from "~/datasources/db";
import { insertUsersSchema, USER } from "~/datasources/db/schema";
import {
findUserByID,
updateUserProfileInfo,
} from "~/datasources/queries/users";
import { getUsername } from "~/datasources/queries/utils/createUsername";
import { unauthorizedError } from "~/errors";
import { ORM_TYPE } from "~workers/db_service/db";
import { insertUserTeamsSchema, USER } from "~workers/db_service/db/schema";

// Obtener el token de autorización de la solicitud, ya sea del encabezado de
// autorización o de la cookie "community-os-access-token"
Expand Down Expand Up @@ -124,7 +124,7 @@ export const upsertUserFromRequest = async ({

const { avatar_url, name, user_name, email_verified, sub, picture } =
payload.user_metadata;
const profileInfo = insertUsersSchema.safeParse({
const profileInfo = insertUserTeamsSchema.safeParse({
email: payload.email.toLowerCase(),
isEmailVerified: email_verified,
imageUrl: avatar_url ? avatar_url : picture ? picture : "",
Expand Down
4 changes: 2 additions & 2 deletions src/authz/helpers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ORM_TYPE } from "~/datasources/db";
import { USER } from "~/datasources/db/schema";
import { ORM_TYPE } from "~workers/db_service/db";
import { USER } from "~workers/db_service/db/schema";
import { Context } from "~/types";

const isCommuntiyAdmin = async ({
Expand Down
Loading