refactoring code

README.md

@@ -6,10 +6,10 @@
 
 This is a base project for the Software Architecture course in 2023/2024. It is a basic application composed of several components.
 
-- User service. Express service that handles the insertion of new users in the system.
-- Auth service. Express service that handles the authentication of users.
-- Gateway service. Express service that is exposed to the public and serves as a proxy to the two previous ones.
-- Webapp. React web application that uses the gateway service to allow basic login and new user features.
+- **User service**. Express service that handles the insertion of new users in the system.
+- **Auth service**. Express service that handles the authentication of users.
+- **Gateway service**. Express service that is exposed to the public and serves as a proxy to the two previous ones.
+- **Webapp**. React web application that uses the gateway service to allow basic login and new user features.
 
 Both the user and auth service share a Mongo database that is accessed with mongoose.
 

authservice/auth-service.js

@@ -2,7 +2,7 @@ const express = require('express');
 const mongoose = require('mongoose');
 const bcrypt = require('bcrypt');
 const jwt = require('jsonwebtoken');
-const User = require('./model')
+const User = require('./auth-model')
 
 const app = express();
 const port = 8002; 

authservice/auth-service.test.js

@@ -1,11 +1,17 @@
 const request = require('supertest');
 const { MongoMemoryServer } = require('mongodb-memory-server');
 const bcrypt = require('bcrypt');
-const User = require('./model');
+const User = require('./auth-model');
 
 let mongoServer;
 let app;
 
+//test user
+const user = {
+  username: 'testuser',
+  password: 'testpassword',
+};
+
 async function addUser(user){
   const hashedPassword = await bcrypt.hash(user.password, 10);
   const newUser = new User({
@@ -21,6 +27,8 @@ beforeAll(async () => {
   const mongoUri = mongoServer.getUri();
   process.env.MONGODB_URI = mongoUri;
   app = require('./auth-service'); 
+  //Load database with initial conditions
+  await addUser(user);
 });
 
 afterAll(async () => {
@@ -30,12 +38,6 @@ afterAll(async () => {
 
 describe('Auth Service', () => {
   it('Should perform a login operation /login', async () => {
-    const user = {
-      username: 'testuser',
-      password: 'testpassword',
-    };
-    await addUser(user);
-
     const response = await request(app).post('/login').send(user);
     expect(response.status).toBe(200);
     expect(response.body).toHaveProperty('username', 'testuser');

userservice/user-service.js

@@ -3,7 +3,7 @@ const express = require('express');
 const mongoose = require('mongoose');
 const bcrypt = require('bcrypt');
 const bodyParser = require('body-parser');
-const User = require('./model')
+const User = require('./user-model')
 
 const app = express();
 const port = 8001;