Mongo 7, fix tests

kernoeb · Jan 20, 2024 · cea383d · cea383d
1 parent 9e278bd
commit cea383d
Show file tree

Hide file tree

Showing 18 changed files with 241 additions and 544 deletions.
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
diff --git a/.idea/dataSources/a3958675-dcf7-490d-b6e1-3516deac097e.xml b/.idea/dataSources/a3958675-dcf7-490d-b6e1-3516deac097e.xml
diff --git a/assets/plannings.json b/assets/plannings.json
@@ -4058,32 +4058,27 @@
                 "url": "https://planning.univ-ubs.fr/jsp/custom/modules/plannings/anonymous_cal.jsp?resources=3669&projectId=1&calType=ical&firstDate={date-start}&lastDate={date-end}"
               },
               {
-                "id": "l1-mmi_ip",
+                "id": "l1-mmi_ip-1",
                 "title": "L1-MMI_IP",
                 "url": "https://planning.univ-ubs.fr/jsp/custom/modules/plannings/anonymous_cal.jsp?resources=4529&projectId=1&calType=ical&firstDate={date-start}&lastDate={date-end}"
               },
               {
-                "id": "l1-mmi_mp",
+                "id": "l1-mmi_mp-1",
                 "title": "L1-MMI_MP",
                 "url": "https://planning.univ-ubs.fr/jsp/custom/modules/plannings/anonymous_cal.jsp?resources=4292&projectId=1&calType=ical&firstDate={date-start}&lastDate={date-end}"
               },
               {
-                "id": "l1-mmi_im",
+                "id": "l1-mmi_im-1",
                 "title": "L1-MmI_IM",
-                "url": "https://planning.univ-ubs.fr/jsp/custom/modules/plannings/anonymous_cal.jsp?resources=1910&projectId=1&calType=ical&firstDate={date-start}&lastDate={date-end}"
+                "url": "https://planning.univ-ubs.fr/jsp/custom/modules/plannings/anonymous_cal.jsp?resources=1910,4080&projectId=1&calType=ical&firstDate={date-start}&lastDate={date-end}"
               },
               {
-                "id": "l1-mmi_im",
-                "title": "L1-MmI_IM",
-                "url": "https://planning.univ-ubs.fr/jsp/custom/modules/plannings/anonymous_cal.jsp?resources=4080&projectId=1&calType=ical&firstDate={date-start}&lastDate={date-end}"
-              },
-              {
-                "id": "l1-mmi_ip",
+                "id": "l1-mmi_ip-2",
                 "title": "L1-MmI_IP",
                 "url": "https://planning.univ-ubs.fr/jsp/custom/modules/plannings/anonymous_cal.jsp?resources=3666&projectId=1&calType=ical&firstDate={date-start}&lastDate={date-end}"
               },
               {
-                "id": "l1-mmi_mp",
+                "id": "l1-mmi_mp-2",
                 "title": "L1-MmI_MP",
                 "url": "https://planning.univ-ubs.fr/jsp/custom/modules/plannings/anonymous_cal.jsp?resources=3502&projectId=1&calType=ical&firstDate={date-start}&lastDate={date-end}"
               },
@@ -9589,12 +9584,12 @@
             "title": "Master MEEF",
             "edts": [
               {
-                "id": "isticmeef2s1",
+                "id": "isticmeef2s1-s1",
                 "title": "Semestre 1",
                 "url": "https://planning.univ-rennes1.fr/jsp/custom/modules/plannings/anonymous_cal.jsp?resources=9648&projectId=1&calType=ical&firstDate={date-start}&lastDate={date-end}"
               },
               {
-                "id": "isticmeef2s1",
+                "id": "isticmeef2s1-s2",
                 "title": "Semestre 2",
                 "url": "https://planning.univ-rennes1.fr/jsp/custom/modules/plannings/anonymous_cal.jsp?resources=9651&projectId=1&calType=ical&firstDate={date-start}&lastDate={date-end}"
               }

diff --git a/docker-compose-dev-arm64.yml b/docker-compose-dev-arm64.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   mongodb:
-    image: arm64v8/mongo:5.0
+    image: mongo:7.0
     restart: always
     ports:
       - "27017:27017"

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -2,11 +2,9 @@ version: '2'
 
 services:
   mongodb:
-    image: docker.io/bitnami/mongodb:5.0
-    #image: ghcr.io/zcube/bitnami-compat/mongodb:5.0
+    image: mongo:7.0
     restart: always
     ports:
       - "27017:27017"
     volumes:
-      - '/opt/planning_v2:/bitnami/mongodb'
-      #- '.mongo-planning:/bitnami/mongodb'
+      - '.mongo-planning:/bitnami/mongodb'
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,29 +3,28 @@ version: '3'
 services:
   web:
     #build: .
-    image: test-planning-2
+    image: ghcr.io/kernoeb/planningsup/planning
     restart: always
     stdin_open: true
     tty: true
     ports:
       - "31021:3000"
     networks:
       - planning
-    #volumes:
-      #- "/etc/timezone:/etc/timezone:ro"
-      #- "/etc/localtime:/etc/localtime:ro"
+    volumes:
+      - "/etc/timezone:/etc/timezone:ro"
+      - "/etc/localtime:/etc/localtime:ro"
     depends_on:
       - mongodb
     env_file:
       - .env
     environment:
       - MONGODB_URL=mongodb:27017
   mongodb:
-    # image: docker.io/bitnami/mongodb:5.0
-    image: arm64v8/mongo:5.0
+    image: mongo:7.0
     restart: always
     volumes:
-      - '.mongo-planning:/bitnami/mongodb'
+      - '/opt/planning_v2:/bitnami/mongodb'
     networks:
       - planning