hotfix: demo preparation

README.md

@@ -36,13 +36,10 @@ PORT = <port>
 The following environment variables are required for connecting the application to a MongoDB account
 
 ```
-DATABASE_USER = <database-username>
-DATABASE_PW = <database-password>
-DATABASE_NAME = <application-database-name>
-DATABASE_TEST_NAME = <test-database-name>
+DATABASE_URI = <database-uri>
 ```
 
-> It is recommended to use a different `test-database-name` for repository forks and local testing
+> It is recommended to use a different database name for repository forks and local testing
 
 #### Deployment
 

config/config.server.config.ts

@@ -3,7 +3,7 @@ import convict from 'convict';
 export default convict({
   environment: {
     format: String,
-    default: 'development',
+    default: 'production',
     env: 'NODE_ENV',
   },
   authToken: {

config/db.server.config.ts

@@ -10,7 +10,8 @@ import config from './config.server.config';
 export function connect(
   uri?: string,
   options?: database.ConnectOptions,
-): Promise<typeof database> {
+): Promise<typeof database | undefined> {
+  if (config.get('environment') === 'testing') return;
   const databaseURI = uri ?? config.get('databaseURI');
   const databaseOptions = options ?? config.get('databaseOptions');
   return database.connect(databaseURI, databaseOptions);

config/db_schemas/comment.schema.ts

@@ -62,6 +62,5 @@ const commentSchema = new Schema<IComment>(
 export type CommentDocument = HydratedDocument<IComment>;
 
 // User can be used to create new documents with the userSchema
-const CommentModel =
-  mongoose.models.Comment || mongoose.model<IComment>('Comment', commentSchema);
+const CommentModel = mongoose.model<IComment>('Comment', commentSchema);
 export default CommentModel;

config/db_schemas/community.schema.ts

@@ -38,7 +38,5 @@ const communitySchema = new Schema<ICommunity>(
 
 export type CommunityDocument = HydratedDocument<ICommunity>;
 
-const CommunityModel =
-  mongoose.models.Community ||
-  mongoose.model<ICommunity>('Community', communitySchema);
+const CommunityModel = mongoose.model<ICommunity>('Community', communitySchema);
 export default CommunityModel;

config/db_schemas/post.schema.ts

@@ -87,6 +87,5 @@ const postSchema = new Schema<IPost>(
 export type PostDocument = HydratedDocument<IPost>;
 
 // Forum can be used to create new documents with the postSchema
-const PostModel =
-  mongoose.models.Post || mongoose.model<IPost>('Post', postSchema);
+const PostModel = mongoose.model<IPost>('Post', postSchema);
 export default PostModel;

config/db_schemas/user.schema.ts

@@ -74,6 +74,5 @@ const userSchema = new Schema<IUser>(
 export type UserDocument = HydratedDocument<IUser>;
 
 // User can be used to create new documents with the userSchema
-const UserModel =
-  mongoose.models.User || mongoose.model<IUser>('User', userSchema);
+const UserModel = mongoose.model<IUser>('User', userSchema);
 export default UserModel;

controllers/user.server.controller.ts

@@ -220,7 +220,7 @@ export async function userViewCurrent(
  * @param res HTTP request response object status code and updated user data in JSON format or error message
  */
 export async function userUpdateCurrent(
-  req: Request,
+  req: TypedRequestBody<UpdateUserDTO>,
   res: Response<UserResponseDTO>,
 ) {
   const authToken = req.get(config.get('authToken'));

models/db.server.model.ts

@@ -55,6 +55,7 @@ export async function generateFakeData(
         displayName: faker.name.findName(firstName, lastName),
         hashedPassword: password.hash,
         salt: password.salt,
+        profilePicture: 'https://source.unsplash.com/random/1920x1080',
       }),
     );
   }
@@ -71,7 +72,7 @@ export async function generateFakeData(
           'COMPSCI',
         ]) + Crypto.randomInt(0, 999).toString().padStart(3, '0'),
       description: faker.commerce.productDescription(),
-      img: faker.image.business(),
+      img: 'https://source.unsplash.com/random/1920x1080',
       owner: faker.random.arrayElement(users)._id,
     });
     communities.push(community);
@@ -87,7 +88,11 @@ export async function generateFakeData(
         upVotes: Crypto.randomInt(0, 100),
         downVotes: Crypto.randomInt(0, 100),
         attachments: faker.random.arrayElements(
-          [faker.image.image(), faker.image.image(), faker.image.image()],
+          [
+            'https://source.unsplash.com/random/1920x1080',
+            'https://source.unsplash.com/random/1920x1080',
+            'https://source.unsplash.com/random/1920x1080',
+          ],
           Crypto.randomInt(0, 4),
         ),
         community: community._id,
@@ -108,7 +113,11 @@ export async function generateFakeData(
           owner: faker.random.arrayElement(users)._id,
           edited: false,
           attachments: faker.random.arrayElements(
-            [faker.image.image(), faker.image.image(), faker.image.image()],
+            [
+              'https://source.unsplash.com/random/1920x1080',
+              'https://source.unsplash.com/random/1920x1080',
+              'https://source.unsplash.com/random/1920x1080',
+            ],
             Crypto.randomInt(0, 4),
           ),
           upVotes: Crypto.randomInt(0, 100),

server.ts

@@ -8,9 +8,8 @@ import { logger } from './lib/middleware.lib';
 const app = createApp();
 const PORT = config.get('port');
 
-const connectFn = config.get('environment') == 'testing' ? resolve : connect;
 // Connect to MongoDB database
-connectFn().then(
+connect().then(
   () => {
     if (require.main === module) {
       app.listen(PORT, function () {