Merge pull request #138 from ezpaarse-project/admin

Admin

README.md

@@ -35,14 +35,11 @@ A web interface is also available as a demonstrator. It allows you to :
 On the front, a nginx acts as a reverse proxy, redirecting all these services to a single entry point.
 
 Each service : 
+* [admin](./services/update#ezunpaywall-admin)
 * [graphql](./services/graphql#ezunpaywall-graphql)
 * [enrich](./services/enrich#ezunpaywall-enrich)
-* [update](./services/update#ezunpaywall-update)
-* [apikey](./services/apikey#ezunpaywall-apikey) 
 * [frontend](./services/frontend#ezunpaywall-frontend)
-* [health](./services/health#ezunpaywall-health)
 * [nginx](./services/nginx#ezunpaywall-nginx)
-* [mail](./services/mail#ezunpaywall-mail)
 * [fakeUnpaywall](./services/fakeUnpaywall#ezunpaywall-fakeUnpaywall) (only for dev)
 
 ## Network-flow
@@ -91,16 +88,15 @@ To run tests, you need ezunpaywall to be launched in dev mode with fakeUnpaywall
 ```bash
 # there are alias on root folder
 npm run test
-npm run test:apikey
+npm run test:admin
 npm run test:enrich
 npm run test:graphql
-npm run test:update
+
 
 # you can run test for each service
-ezunpaywall/src/apikey npm run test
+ezunpaywall/src/admin npm run test
 ezunpaywall/src/enrich npm run test
 ezunpaywall/src/graphql npm run test
-ezunpaywall/src/update npm run test
 ```
 ### Deployment
 
@@ -146,4 +142,4 @@ docker-compose ps
 ## Data update 
 
 You can update your data via update snapshots provided by unpaywall on a weekly or daily basis (if you have API key).
-in the update service, there is a cron that allows to automatically update the data from unpaywall, weekly or daily.
+in the admin service, there is a cron that allows to automatically update the data from unpaywall, weekly or daily.

docker-compose.debug.yml

@@ -7,8 +7,7 @@ services:
     environment:
       - NODE_ENV
       # elastic
-      - ELASTICSEARCH_HOSTS
-      - ELASTICSEARCH_PORT
+      - ELASTICSEARCH_NODES
       - ELASTICSEARCH_USERNAME
       - ELASTICSEARCH_PASSWORD
       - ELASTICSEARCH_INDEX_ALIAS
@@ -22,53 +21,6 @@ services:
     command: "npm run dev"
     ports:
       - ${GRAPHQL_PORT:-59701}:3000
-    depends_on:
-      redis:
-        condition: service_healthy
-    restart: unless-stopped
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "wget -Y off --no-verbose --tries=1 --spider http://localhost:3000/healthcheck || exit 1"
-        ]
-      interval: 10s
-      timeout: 10s
-      retries: 5
-
-  update:
-    image: node:18.19.1
-    container_name: ezunpaywall-update-dev
-    environment:
-      - NODE_ENV
-      - LOG_LEVEL=debug
-      # unpaywall
-      - UNPAYWALL_APIKEY
-      - UNPAYWALL_HOST
-      # elastic
-      - ELASTICSEARCH_HOSTS
-      - ELASTICSEARCH_PORT
-      - ELASTICSEARCH_USERNAME
-      - ELASTICSEARCH_PASSWORD
-      - ELASTICSEARCH_INDEX_ALIAS
-      - ELASTICSEARCH_TIMEOUT
-      # redis
-      - REDIS_HOST
-      - REDIS_PORT
-      - REDIS_PASSWORD
-      # cron
-      - UPDATE_CRON_SCHEDULE
-      - UPDATE_CRON_ACTIVE
-      - UPDATE_CRON_INDEX
-      - UPDATE_CRON_INTERVAL
-      # password
-      - UPDATE_APIKEY
-    working_dir: /usr/src/app
-    volumes:
-      - ./services/update:/usr/src/app
-    command: "npm run dev"
-    ports:
-      - ${UPDATE_PORT:-59702}:3000
     restart: unless-stopped
     healthcheck:
       test:
@@ -90,18 +42,13 @@ services:
       - REDIS_PORT
       - REDIS_PASSWORD
       # graphql
-      - GRAPHQL_HOST=http://graphql:3000
+      - GRAPHQL_URL=http://graphql:3000
     working_dir: /usr/src/app
     volumes:
       - ./services/enrich:/usr/src/app
     command: "npm run dev"
     ports:
-      - ${ENRICH_PORT:-59703}:3000
-    depends_on:
-      redis:
-        condition: service_healthy
-      elastic:
-        condition: service_healthy
+      - ${ENRICH_PORT:-59702}:3000
     restart: unless-stopped
     healthcheck:
       test:
@@ -112,54 +59,63 @@ services:
       interval: 10s
       timeout: 10s
       retries: 5
-
-  apikey:
+  
+  admin:
     image: node:18.19.1
-    container_name: ezunpaywall-apikey-dev
+    container_name: ezunpaywall-admin-dev
     environment:
       - NODE_ENV
+      - LOG_LEVEL=debug
+      # smtp
+      - SMTP_HOST=maildev
+      - SMTP_PORT
+      # mail
+      - NOTIFICATIONS_SENDER
+      - NOTIFICATIONS_RECEIVERS
+      - NOTIFICATIONS_MACHINE
+      # unpaywall
+      - UNPAYWALL_APIKEY
+      - UNPAYWALL_URL
+      # elastic
+      - ELASTICSEARCH_NODES
+      - ELASTICSEARCH_USERNAME
+      - ELASTICSEARCH_PASSWORD
+      - ELASTICSEARCH_INDEX_ALIAS
+      - ELASTICSEARCH_TIMEOUT
       # redis
       - REDIS_HOST
       - REDIS_PORT
       - REDIS_PASSWORD
-    working_dir: /usr/src/app
-    volumes:
-      - ./services/apikey:/usr/src/app
-    command: "npm run dev"
-    ports:
-      - ${APIKEY_PORT:-59704}:3000
-    depends_on:
-      redis:
-        condition: service_healthy
-    restart: unless-stopped
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "wget -Y off --no-verbose --tries=1 --spider http://localhost:3000/healthcheck || exit 1"
-        ]
-      interval: 10s
-      timeout: 10s
-      retries: 5
-
-  mail:
-    image: node:18.19.1
-    container_name: ezunpaywall-mail-dev
-    environment:
-      - NODE_CONFIG
-      - MAIL_SMTP_HOST=maildev
-      - MAIL_SMTP_PORT
-      - MAIL_NOTIFICATIONS_SENDER
-      - MAIL_NOTIFICATIONS_RECEIVERS
-      - MAIL_NOTIFICATIONS_MACHINE
+      # cron snapshot
+      - CRON_DOWNLOAD_SNAPSHOT_SCHEDULE
+      - CRON_DOWNLOAD_SNAPSHOT_ACTIVE
+      - CRON_DOWNLOAD_SNAPSHOT_INDEX
+      # cron date update
+      - CRON_DATA_UPDATE_SCHEDULE
+      - CRON_DATA_UPDATE_ACTIVE
+      - CRON_DATA_UPDATE_INDEX
+      - CRON_DATA_UPDATE_INTERVAL
+      # cron date update history
+      - CRON_DATA_UPDATE_HISTORY_SCHEDULE
+      - CRON_DATA_UPDATE_HISTORY_ACTIVE
+      - CRON_DATA_UPDATE_HISTORY_INDEX
+      - CRON_DATA_UPDATE_HISTORY_INDEX_HISTORY
+      - CRON_DATA_UPDATE_HISTORY_INTERVAL
+      # cron clean file
+      - CRON_CLEAN_FILE_SCHEDULE
+      - CRON_CLEAN_FILE_CHANGEFILE_THRESHOLD
+      - CRON_CLEAN_FILE_REPORT_THRESHOLD
+      - CRON_CLEAN_FILE_SNAPSHOT_THRESHOLD
       # password
-      - MAIL_APIKEY
+      - ADMIN_APIKEY
+      # health
+      - HEALTH_TIMEOUT
     working_dir: /usr/src/app
     volumes:
-      - ./services/mail:/usr/src/app
+      - ./services/admin:/usr/src/app
     command: "npm run dev"
     ports:
-      - ${MAIL_PORT:-59705}:3000
+      - ${ADMIN_PORT:-59703}:3000
     restart: unless-stopped
     healthcheck:
       test:
@@ -183,19 +139,17 @@ services:
       - 24678:24678
     environment:
       - NODE_ENV
-      - NUXT_PUBLIC_ENVIRONMENT=development
+      - NUXT_PUBLIC_ENVIRONMENT
       - NUXT_PUBLIC_ELASTIC_ENV=development
       - NUXT_PUBLIC_VERSION=development
-      - NUXT_PUBLIC_UNPAYWALL_HOMEPAGE_HOST
-      - NUXT_PUBLIC_UNPAYWALL_API_HOST
-      - NUXT_PUBLIC_UNPAYWALL_HOST
-      - NUXT_PUBLIC_GRAPHQL_HOST
-      - NUXT_PUBLIC_UPDATE_HOST
-      - NUXT_PUBLIC_ENRICH_HOST
-      - NUXT_PUBLIC_APIKEY_HOST
-      - NUXT_PUBLIC_MAIL_HOST
-      - NUXT_MAIL_HOST
-      - NUXT_MAIL_APIKEY
+      - NUXT_PUBLIC_UNPAYWALL_HOMEPAGE_URL
+      - NUXT_PUBLIC_UNPAYWALL_API_URL
+      - NUXT_PUBLIC_UNPAYWALL_URL
+      - NUXT_PUBLIC_GRAPHQL_URL
+      - NUXT_PUBLIC_ENRICH_URL
+      - NUXT_PUBLIC_ADMIN_URL
+      - NUXT_ADMIN_URL
+      - NUXT_ADMIN_APIKEY
     healthcheck:
       test:
         [
@@ -226,18 +180,15 @@ services:
       retries: 5
 
   nginx:
-    image: nginx:1.25.2
+    image: nginx:1.27.2
     container_name: ezunpaywall-nginx-dev
     environment:
       # host of service
       - NGINX_HOST=localhost
-      - FRONTEND_HOST=http://frontend:3000/
-      - GRAPHQL_HOST=http://graphql:3000/
-      - UPDATE_HOST=http://update:3000/
-      - ENRICH_HOST=http://enrich:3000/
-      - APIKEY_HOST=http://apikey:3000/
-      - MAIL_HOST=http://mail:3000/
-      - HEALTH_HOST=http://health:3000/
+      - FRONTEND_URL=http://frontend:3000/
+      - GRAPHQL_URL=http://graphql:3000/
+      - ENRICH_URL=http://enrich:3000/
+      - ADMIN_URL=http://admin:3000/
     ports:
       - ${NGINX_PORT:-80}:80
     volumes:
@@ -246,14 +197,10 @@ services:
     depends_on:
       enrich:
         condition: service_healthy
-      update:
+      admin:
         condition: service_healthy
       graphql:
         condition: service_healthy
-      apikey:
-        condition: service_healthy
-      mail:
-        condition: service_healthy
       frontend:
         condition: service_healthy
     healthcheck: