Revert "Fix bloglist backend CI startup flow"

.github/workflows/ci.yml

@@ -18,6 +18,11 @@ jobs:
         image: mongo:7
         ports:
           - 27017:27017
+        options: >-
+          --health-cmd "mongosh --eval 'db.adminCommand({ ping: 1 })'"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     env:
       MONGODB_URI: mongodb://127.0.0.1:27017/bloglist
       DEV_MONGODB_URI: mongodb://127.0.0.1:27017/bloglist-dev
@@ -37,17 +42,6 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: Wait for MongoDB
-        run: |
-          for i in {1..30}; do
-            if node -e "const net=require('node:net'); const socket=net.createConnection(27017,'127.0.0.1'); socket.on('connect',()=>{socket.end();process.exit(0)}); socket.on('error',()=>process.exit(1));"; then
-              exit 0
-            fi
-            sleep 2
-          done
-          echo "MongoDB did not become ready in time"
-          exit 1
-
       - name: Lint
         run: npm run lint
 

part4/bloglist/app.js

@@ -1,18 +1,29 @@
 const express = require("express");
+const mongoose = require("mongoose");
 const cors = require("cors");
 const path = require("path");
 
 const config = require("./utils/config");
 const logger = require("./utils/logger");
-const { connectToMongo } = require("./utils/mongo");
 const middleware = require("./utils/middleware");
 const blogsRouter = require("./controllers/blogs");
 const usersRouter = require("./controllers/users");
 const loginRouter = require("./controllers/login");
 const testingRouter = require("./controllers/testing");
 
 const app = express();
-const mongoConnection = connectToMongo();
+
+logger.info("connecting to", config.MONGODB_URI);
+
+mongoose
+  .connect(config.MONGODB_URI, { family: 4, serverSelectionTimeoutMS: 5000 })
+  .then(() => {
+    logger.info("connected to MongoDB");
+  })
+  .catch((error) => {
+    logger.error("error connecting to MongoDB:", error.message);
+    process.exit(1);
+  });
 
 app.use(cors());
 app.use(express.json());
@@ -39,4 +50,4 @@ app.get("/{*path}", (req, res) => {
 app.use(middleware.unknownEndpoint);
 app.use(middleware.errorHandler);
 
-module.exports = { app, mongoConnection };
+module.exports = app;

part4/bloglist/index.js

@@ -1,14 +1,7 @@
-const { app, mongoConnection } = require("./app");
+const app = require("./app");
 const config = require("./utils/config");
 const logger = require("./utils/logger");
 
-mongoConnection
-  .then(() => {
-    app.listen(config.PORT, () => {
-      logger.info(`Server running on port ${config.PORT}`);
-    });
-  })
-  .catch((error) => {
-    logger.error("error connecting to MongoDB:", error.message);
-    process.exit(1);
-  });
+app.listen(config.PORT, () => {
+  logger.info(`Server running on port ${config.PORT}`);
+});