Skip to content

Migrate the latest develop-postgres branch into develop #3473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 19, 2025
Merged

Migrate the latest develop-postgres branch into develop #3473

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bfc2117
20250518161829 Deleted all files in the develop branch in anticipatio…
palisadoes May 18, 2025
b5e7738
20250518161841 Merge develop-postgres into develop
palisadoes May 18, 2025
834b8bd
20250518162056 Merge develop-postgres into develop
palisadoes May 18, 2025
e7c44e5
20250518162939 Merge develop-postgres into develop
palisadoes May 18, 2025
69b22cd
20250518164715 Merge develop-postgres into develop
palisadoes May 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
16 changes: 12 additions & 4 deletions .coderabbit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
# More information at this link: https://docs.coderabbit.ai/configure-coderabbit

language: "en-US"
early_access: false
chat:
auto_reply: true
reviews:
profile: "chill"
profile: "assertive"
poem: false
request_changes_workflow: true
high_level_summary: true
poem: true
review_status: true
collapse_walkthrough: false
auto_review:
enabled: true
drafts: false
base_branches:
- develop-postgres
- develop
- main
chat:
auto_reply: true
path_filters:
- '!**/docs/docs/**'
- "!*.html"
- "!*.md"
Comment on lines +22 to +26
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Validate path_filters for documentation directory
The pattern !**/docs/docs/** likely doesn’t match the intended docs/** path (it repeats docs). Adjust to properly exclude all documentation files.

-    - '!**/docs/docs/**'
+    - '!docs/**'
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
path_filters:
- '!**/docs/docs/**'
- "!*.html"
- "!*.md"
- "!*.svg"
path_filters:
- '!docs/**'
- "!*.html"
- "!*.md"
- "!*.svg"
🤖 Prompt for AI Agents 
In .coderabbit.yaml around lines 22 to 26, the path filter pattern
'!**/docs/docs/**' incorrectly repeats 'docs' and does not properly exclude the
intended documentation directory. Update the pattern to '!docs/**' to correctly
exclude all files under the docs directory.

- "!*.svg"
24 changes: 0 additions & 24 deletions .devcontainer/Dockerfile
View file
Open in desktop

This file was deleted.

111 changes: 77 additions & 34 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,79 @@
// https://containers.dev/implementors/json_reference/
// https://github.com/orgs/devcontainers/discussions/4
{
"name": "talawa api dev environment",
"dockerComposeFile": "docker-compose.yaml",
"service": "devcontainer",
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
// Settings to apply to the workspace.
"customizations": {
// Configure properties specific to VS Code.
"vscode": {
"settings": {
"terminal.integrated.shell.linux": "/bin/bash",
"typescript.tsdk": "node_modules/typescript/lib",
"database.host": "mongodb",
"redis.host": "redis-stack-server"
},
// List of extensions to install inside the container
"extensions": [
"dbaeumer.vscode-eslint",
"ms-azuretools.vscode-docker",
"esbenp.prettier-vscode",
"redhat.vscode-yaml"
]
}
},
// Set up forward ports
"forwardPorts": [
4000, // Server port
27017, // MongoDB port
6379 // Redis port
],
// Post-create commands to run after creating the container
"postCreateCommand": "npm install",

// Volumes from docker-compose are already included
"shutdownAction": "stopCompose"
"$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.schema.json",
"containerUser": "talawa",
"customizations": {
"vscode": {
"extensions": [
"biomejs.biome",
"esbenp.prettier-vscode",
"GraphQL.vscode-graphql",
"GraphQL.vscode-graphql-syntax",
"redhat.vscode-yaml"
],
"settings": {
"editor.codeActionsOnSave": {
"quickfix.biome": "explicit",
"source.organizeImports.biome": "explicit"
},
"editor.formatOnSave": true,
"editor.lineNumbers": "relative",
"editor.mouseWheelZoom": true,
"editor.wordWrap": "on",
"typescript.enablePromptUseWorkspaceTsdk": true,
"typescript.tsdk": "./node_modules/typescript/lib",
"[graphql]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[javascript]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[json]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[jsonc]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[markdown]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[yaml]": {
"editor.defaultFormatter": "redhat.vscode-yaml"
}
}
}
},
"dockerComposeFile": [
"../compose.yaml",
"../docker/compose.testing.yaml",
"../docker/compose.devcontainer.yaml"
],
"features": {
// https://github.com/devcontainers/features/tree/main/src/common-utils
"ghcr.io/devcontainers/features/common-utils": {
"installZsh": false,
"installOhMyZsh": false,
"installOhMyZshConfig": false,
"nonFreePackages": true,
"username": "talawa"
},
// https://github.com/devcontainers/features/tree/main/src/git
"ghcr.io/devcontainers/features/git": {},
// https://github.com/devcontainers/features/tree/main/src/github-cli
"ghcr.io/devcontainers/features/github-cli": {}
},
"init": true,
"initializeCommand": "/bin/sh -c '[ ! -f .env ] && cp ./envFiles/.env.devcontainer ./.env || true'",
"name": "talawa_api",
"overrideCommand": true,
"postCreateCommand": "sudo chown talawa:talawa ./.pnpm-store ./node_modules && fnm install && fnm use && corepack enable npm && corepack enable && corepack install && pnpm install",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Split complex postCreateCommand
This single-line command is long and hard to maintain. You could instead define an array of commands or reference a script file checked into the repo:

"postCreateCommand": [
  "sudo chown talawa:talawa ./.pnpm-store ./node_modules",
  "fnm install",
  "fnm use",
  "corepack enable",
  "pnpm install"
]
🤖 Prompt for AI Agents 
In .devcontainer/devcontainer.json at line 73, the postCreateCommand is a long
single-line string that is hard to maintain. Refactor it by splitting the
command into an array of individual commands, each as a separate string element
in the array, or alternatively reference a script file in the repo. This
improves readability and maintainability of the devcontainer setup.

"postStartCommand": "pnpm install",
"remoteUser": "talawa",
"service": "api",
"shutdownAction": "stopCompose",
"workspaceFolder": "/home/talawa/api"
}
34 changes: 0 additions & 34 deletions .devcontainer/docker-compose.yaml
View file
Open in desktop

This file was deleted.

Loading
Loading