2836153887
* Refactor GraphQL client usage in services to improve consistency - Replaced direct calls to `getClientWithToken` with a new method `getGraphQLClient` across multiple services, ensuring a unified approach to obtaining the GraphQL client. - Updated the `BaseService` to manage the GraphQL client instance, enhancing performance by reusing the client when available. * Refactor UpdateProfile component to use useClientOnce for initial profile update - Replaced useEffect with useClientOnce to handle the first login profile update more efficiently. - Removed local state management for hasUpdated, simplifying the component logic. - Updated localStorage handling to ensure the profile update occurs only on the first login. * Refactor Apollo Client setup to improve modularity and maintainability - Introduced a new `createLink` function to encapsulate the link creation logic for Apollo Client. - Updated `createApolloClient` to utilize the new `createLink` function, enhancing code organization. - Simplified the handling of authorization headers by moving it to the link configuration. * Add cache-proxy application with initial setup and configuration - Created a new cache-proxy application using NestJS, including essential files such as Dockerfile, .gitignore, and .eslintrc.js. - Implemented core application structure with AppModule, ProxyModule, and ProxyController for handling GraphQL requests. - Configured caching with Redis and established environment variable management using Zod for validation. - Added utility functions for query handling and time management, enhancing the application's functionality. - Included README.md for project documentation and setup instructions. * Add cache-proxy service to Docker configurations and update deployment workflow</message> <message> - Introduced a new cache-proxy service in both `docker-compose.dev.yml` and `docker-compose.yml`, with dependencies on Redis and integration into the web and bot services. - Updated GitHub Actions workflow to include build and push steps for the cache-proxy image, ensuring it is deployed alongside web and bot services. - Modified environment variable management to accommodate the cache-proxy, enhancing the overall deployment process. - Adjusted GraphQL cached URL to point to the cache-proxy service for improved request handling. * Add health check endpoint and controller to cache-proxy service - Implemented a new HealthController in the cache-proxy application to provide a health check endpoint at `/api/health`, returning a simple status response. - Updated the AppModule to include the HealthController, ensuring it is registered within the application. - Configured a health check in the Docker Compose file for the cache-proxy service, allowing for automated health monitoring. * Update proxy controller and environment variable for cache-proxy service - Changed the route prefix of the ProxyController from `/proxy` to `/api` to align with the new API structure. - Updated the default value of the `URL_GRAPHQL_CACHED` environment variable to reflect the new route, ensuring proper integration with the GraphQL service. * Update cache proxy configuration for query time-to-live settings - Increased the time-to-live for `GetCustomer`, `GetOrder`, `GetService`, and `GetSlot` queries to 24 hours, enhancing cache efficiency and performance. - Maintained the existing setting for `GetSubscriptions`, which remains at 12 hours. * Enhance subscription management and configuration settings - Added new query time-to-live settings for `GetSlotsOrders`, `GetSubscriptionPrices`, and `GetSubscriptions` to improve caching strategy. - Implemented `hasTrialSubscription` method in `SubscriptionsService` to check for trial subscriptions based on user history, enhancing subscription management capabilities. - Updated GraphQL operations to reflect the change from `getSubscriptionSettings` to `GetSubscriptionSettings`, ensuring consistency in naming conventions. * fix build * Refactor subscription settings naming - Updated the naming of `getSubscriptionSettings` to `GetSubscriptionSettings` in the cache-proxy configuration for consistency with other settings.
77 lines
1.5 KiB
YAML
77 lines
1.5 KiB
YAML
services:
|
|
cache-proxy:
|
|
image: ${DOCKERHUB_USERNAME}/zapishis-cache-proxy:${CACHE_PROXY_IMAGE_TAG}
|
|
env_file:
|
|
- .env
|
|
restart: always
|
|
depends_on:
|
|
- redis
|
|
networks:
|
|
- app
|
|
- web
|
|
healthcheck:
|
|
test: ['CMD', 'wget', '-qO-', 'http://localhost:5000/api/health']
|
|
interval: 10s
|
|
timeout: 3s
|
|
retries: 5
|
|
web:
|
|
image: ${DOCKERHUB_USERNAME}/zapishis-web:${WEB_IMAGE_TAG}
|
|
env_file:
|
|
- .env
|
|
restart: always
|
|
healthcheck:
|
|
test: ['CMD', 'curl', '-f', 'http://localhost:3000/api/health']
|
|
interval: 10s
|
|
timeout: 3s
|
|
retries: 5
|
|
depends_on:
|
|
- cache-proxy
|
|
networks:
|
|
- app
|
|
- web
|
|
|
|
bot:
|
|
image: ${DOCKERHUB_USERNAME}/zapishis-bot:${BOT_IMAGE_TAG}
|
|
restart: always
|
|
env_file:
|
|
- .env
|
|
depends_on:
|
|
- redis
|
|
- cache-proxy
|
|
networks:
|
|
- app
|
|
|
|
redis:
|
|
image: redis:8-alpine
|
|
restart: always
|
|
env_file:
|
|
- .env
|
|
command: ['redis-server', '--requirepass', '${REDIS_PASSWORD}']
|
|
volumes:
|
|
- redis-data:/data
|
|
deploy:
|
|
resources:
|
|
limits:
|
|
cpus: '0.50'
|
|
memory: 512M
|
|
reservations:
|
|
cpus: '0.25'
|
|
memory: 256M
|
|
healthcheck:
|
|
test: ['CMD', 'redis-cli', 'ping']
|
|
interval: 30s
|
|
timeout: 10s
|
|
retries: 3
|
|
start_period: 30s
|
|
networks:
|
|
- app
|
|
|
|
volumes:
|
|
redis-data:
|
|
|
|
networks:
|
|
app:
|
|
external: true
|
|
web:
|
|
external: true
|