From e619b647073c2c042d96c5fc3e967e56f03a4f05 Mon Sep 17 00:00:00 2001 From: Athitheya Gobinathan Date: Mon, 13 May 2024 18:53:03 -0400 Subject: [PATCH 1/5] build: Upgraded pymongo to 4.7.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8566198..347d99a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ Flask-Cors==3.0.9 Flask-PyMongo==2.3.0 pydantic==1.10.8 PyJWT==2.4.0 -pymongo==3.10.1 +pymongo==4.7.2 PyYAML==6.0.1 requests==2.31.0 swagger-ui-bundle==0.0.6 From c6ea348ffd7220fd21f7ca7b9870e13ba0b35ff7 Mon Sep 17 00:00:00 2001 From: Athitheya Gobinathan Date: Mon, 13 May 2024 18:54:07 -0400 Subject: [PATCH 2/5] test: Change deprecated Cursor.count() to Collection.count_documents() --- examples/petstore-access-control/controllers.py | 2 +- examples/petstore/controllers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/petstore-access-control/controllers.py b/examples/petstore-access-control/controllers.py index b39b101..cfc6a3f 100644 --- a/examples/petstore-access-control/controllers.py +++ b/examples/petstore-access-control/controllers.py @@ -37,7 +37,7 @@ def addPet(pet): ) counter = 0 ctr = db_collection.find({}).sort([('$natural', -1)]) - if not ctr.count() == 0: + if not db_collection.count_documents({}) == 0: counter = ctr[0].get('id') + 1 record = { "id": counter, diff --git a/examples/petstore/controllers.py b/examples/petstore/controllers.py index 1bbd79f..b8fad83 100644 --- a/examples/petstore/controllers.py +++ b/examples/petstore/controllers.py @@ -32,7 +32,7 @@ def addPet(pet): ) counter = 0 ctr = db_collection.find({}).sort([('$natural', -1)]) - if not ctr.count() == 0: + if not db_collection.count_documents({}) == 0: counter = ctr[0].get('id') + 1 record = { "id": counter, From b6729aec9f0e9be32c689d4d39b34f0f998c6439 Mon Sep 17 00:00:00 2001 From: Athitheya Gobinathan Date: Mon, 13 May 2024 18:56:20 -0400 Subject: [PATCH 3/5] test: Changed db port to reflect port referenced in tests --- examples/petstore-access-control/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/petstore-access-control/docker-compose.yaml b/examples/petstore-access-control/docker-compose.yaml index f9a58de..6312dc0 100644 --- a/examples/petstore-access-control/docker-compose.yaml +++ b/examples/petstore-access-control/docker-compose.yaml @@ -31,4 +31,4 @@ services: volumes: - ./data/petstore-access-control/db:/data/db ports: - - "27017:27017" + - "12345:27017" From 9c7a55080bb730aebb9ba58181efe0f4edb69162 Mon Sep 17 00:00:00 2001 From: Athitheya Gobinathan Date: Tue, 14 May 2024 10:54:46 -0400 Subject: [PATCH 4/5] revert: Changed db port back to 27017 --- examples/petstore-access-control/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/petstore-access-control/docker-compose.yaml b/examples/petstore-access-control/docker-compose.yaml index 6312dc0..f9a58de 100644 --- a/examples/petstore-access-control/docker-compose.yaml +++ b/examples/petstore-access-control/docker-compose.yaml @@ -31,4 +31,4 @@ services: volumes: - ./data/petstore-access-control/db:/data/db ports: - - "12345:27017" + - "27017:27017" From 8f3b94dcc27bf7c36c3895c60cc770f952a86c51 Mon Sep 17 00:00:00 2001 From: Athitheya Gobinathan Date: Tue, 14 May 2024 11:20:55 -0400 Subject: [PATCH 5/5] build: Updated mongoDB to 7.0 in example apps --- examples/petstore-access-control/docker-compose.yaml | 2 +- examples/petstore/docker-compose.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/petstore-access-control/docker-compose.yaml b/examples/petstore-access-control/docker-compose.yaml index f9a58de..cef463b 100644 --- a/examples/petstore-access-control/docker-compose.yaml +++ b/examples/petstore-access-control/docker-compose.yaml @@ -26,7 +26,7 @@ services: - "80:8080" mongodb: - image: mongo:3.6 + image: mongo:7.0 restart: unless-stopped volumes: - ./data/petstore-access-control/db:/data/db diff --git a/examples/petstore/docker-compose.yaml b/examples/petstore/docker-compose.yaml index 36bd6a6..cb41b87 100644 --- a/examples/petstore/docker-compose.yaml +++ b/examples/petstore/docker-compose.yaml @@ -26,7 +26,7 @@ services: - "80:8080" mongodb: - image: mongo:3.6 + image: mongo:7.0 restart: unless-stopped volumes: - ./data/petstore/db:/data/db