refactor: user types

services/api/src/app/auth/auth0/identify.decorator.ts

@@ -1,5 +1,5 @@
 import { createParamDecorator, ExecutionContext } from '@nestjs/common';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 
 export const Identify = createParamDecorator(
   async (_data: unknown, ctx: ExecutionContext): Promise<User> => {

services/api/src/app/auth/auth0/identify.service.ts

@@ -1,8 +1,5 @@
-import { User } from '@entities/user.entity';
-import {
-  userParamsFromAuth,
-  UsersRepository,
-} from '@entities/users.repository';
+import { User } from '@entities/users';
+import { userParamsFromAuth, UsersRepository } from '@entities/users';
 import {
   ConsoleLogger,
   Injectable,

services/api/src/app/auth/auth0/jwt.strategy.ts

@@ -4,7 +4,7 @@ import { ExtractJwt, Strategy } from 'passport-jwt';
 import { passportJwtSecret } from 'jwks-rsa';
 import { config } from './auth0.config';
 import { Request } from 'express';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { IdentifyService } from './identify.service';
 
 @Injectable()

services/api/src/app/auth/permissions/roles.ts

@@ -1,7 +1,7 @@
 import { AbilityBuilder, createMongoAbility } from '@casl/ability';
 import { Membership, MembershipStatus } from '@entities/membership.entity';
 import { ContentPolicy, JoinPolicy } from '@entities/room.entity';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { Role } from '@usecases/auth.service';
 import { pluck } from 'rambda';
 

services/api/src/app/dispatcher/dispatcher.service.ts

@@ -1,7 +1,7 @@
 import { Dispatcher, DraftMessage, isPrivate } from '@entities/messages';
 import { MessagesRepository } from '@entities/messages';
 import { RoomsRepository } from '@entities/rooms.repository';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { ConsoleLogger, Injectable } from '@nestjs/common';
 import { AuthService, Role } from '@usecases/auth.service';
 import { fromEvent, merge, Observable } from 'rxjs';

services/api/src/app/messages/command.service.ts

@@ -1,5 +1,5 @@
 import { Command } from '@entities/command.entity';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { Injectable } from '@nestjs/common';
 import { HelpCommandUseCase } from '@usecases/commands/help';
 import { RenameRoomUseCase } from '@usecases/rooms/rename';

services/api/src/app/messages/messages.controller.spec.ts

@@ -9,7 +9,7 @@ import {
   resetFakeAuthUsers,
 } from '@fixtures/auth/FakeAuth';
 import { MessageFactory } from '@fixtures/messages/message.factory';
-import { UsersRepository } from '@entities/users.repository';
+import { UsersRepository } from '@entities/users';
 import { MessagesRepository } from '@entities/messages';
 import { TestDataModule } from '@fixtures/data/test.data.module';
 import { TestUsersRepository } from '@fixtures/data/test.users.repository';

services/api/src/app/messages/messages.controller.ts

@@ -3,7 +3,7 @@ import { MessagesService } from './messages.service';
 import { CreateMessageDto } from './dto/create-message.dto';
 import { Auth } from '@app/auth/auth.decorator';
 import { Identify } from '@app/auth/auth0/identify.decorator';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { Dispatcher } from '@entities/messages';
 import { GetMessagesUseCase } from '@usecases/messages/get-messages';
 

services/api/src/app/messages/messages.service.spec.ts

@@ -2,12 +2,13 @@ import { MessagesService } from './messages.service';
 import { CreateMessageDto } from './dto/create-message.dto';
 import { UserFactory } from '@fixtures/messages/user.factory';
 import { RoomFactory } from '@fixtures/messages/room.factory';
-import { User, systemUser } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { mock, MockProxy } from 'jest-mock-extended';
 import { SendMessageUseCase } from '@usecases/messages/send';
 import { CommandService } from './command.service';
 import { Command } from '@entities/command.entity';
 import { UnauthorizedException } from '@nestjs/common';
+import { systemUser } from '@entities/users';
 
 describe('MessagesService', () => {
   let service: MessagesService;

services/api/src/app/messages/messages.service.ts

@@ -1,6 +1,6 @@
 import { HttpException, Injectable } from '@nestjs/common';
 import { CreateMessageDto } from './dto/create-message.dto';
-import { User, systemUser } from '@entities/user.entity';
+import { User, systemUser } from '@entities/users';
 import { SendMessageUseCase } from '@usecases/messages/send';
 import { CommandService } from '@app/messages/command.service';
 import { isCommand, parseMessage } from '@usecases/messages/parse-message';

services/api/src/app/rooms/rooms.controller.ts

@@ -1,7 +1,7 @@
 import { Auth } from '@app/auth/auth.decorator';
 import { Identify } from '@app/auth/auth0/identify.decorator';
 import { ConsoleLogger, Controller, Get, Param, Post } from '@nestjs/common';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { CreateRoomUseCase } from '@usecases/rooms/create';
 import { GetRoomUseCase } from '@usecases/rooms/get';
 import { JoinRoomUseCase } from '@usecases/rooms/join';

services/api/src/app/users/users.controller.ts

@@ -1,6 +1,6 @@
 import { Auth } from '@app/auth/auth.decorator';
 import { Identify } from '@app/auth/auth0/identify.decorator';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { Controller, Get, Param } from '@nestjs/common';
 import { UsersService } from './users.service';
 

services/api/src/app/users/users.service.ts

@@ -2,8 +2,8 @@ import { MembershipStatus } from '@entities/membership.entity';
 import { MembershipsRepository } from '@entities/memberships.repository';
 import { Room } from '@entities/room.entity';
 import { RoomsRepository } from '@entities/rooms.repository';
-import { User } from '@entities/user.entity';
-import { UsersRepository } from '@entities/users.repository';
+import { User } from '@entities/users';
+import { UsersRepository } from '@entities/users';
 import { Injectable } from '@nestjs/common';
 import { filter, pluck, uniq } from 'rambda';
 

services/api/src/data/data.module.ts

@@ -4,7 +4,7 @@ import { MessagesRepository } from '@entities/messages';
 import databaseConfig from '@config/database.config';
 import { DynamoDBMessagesRepository } from './repositories/dynamodb.messages.repository';
 import { RoomsRepository } from '@entities/rooms.repository';
-import { UsersRepository } from '@entities/users.repository';
+import { UsersRepository } from '@entities/users';
 import { DynamoDBUsersRepository } from './repositories/dynamodb.users.repository';
 import { DynamoDBAdapter } from './adapters/dynamodb.adapter';
 import { DynamoDBRoomsRepository } from './repositories/dynamodb.rooms.repository';

services/api/src/data/repositories/dynamodb.users.repository.e2e-spec.ts

@@ -1,5 +1,5 @@
 import { DynamoDBUsersRepository } from '@data/repositories/dynamodb.users.repository';
-import { SaveUserParams } from '@entities/users.repository';
+import { SaveUserParams } from '@entities/users';
 import { TestUsersRepository } from '@fixtures/data/test.users.repository';
 import { Test, TestingModule } from '@nestjs/testing';
 import { DataModule } from '../data.module';

services/api/src/data/repositories/dynamodb.users.repository.ts

@@ -1,9 +1,9 @@
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import {
   SaveUserParams,
   UpdateUserParams,
   UsersRepository,
-} from '@entities/users.repository';
+} from '@entities/users';
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { pick } from 'rambda';
 import { DynamoDBAdapter } from '../adapters/dynamodb.adapter';

services/api/src/domain/entities/messages/index.ts

@@ -1,3 +1,2 @@
 export * from './message';
-export * from './system';
 export * from './messages.repository';

services/api/src/domain/entities/messages/message.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { User } from '../user.entity';
+import { User } from '../users/user.entity';
 
 export type SentMessage = {
   id: string;

services/api/src/domain/entities/users/index.ts

@@ -0,0 +1,3 @@
+export * from './user.entity';
+export * from './users.repository';
+export * from './system';

services/api/src/domain/entities/users/system.ts

@@ -0,0 +1,21 @@
+import { SentMessage, DraftMessage } from '../messages/message';
+
+export const systemUser = Object.freeze({
+  id: 'system',
+  name: 'System',
+});
+
+export const isSystemMessage = (message: SentMessage): boolean => {
+  return message.authorId === systemUser.id;
+};
+
+export const buildSystemMessage = ({
+  content,
+  roomId,
+}: Omit<DraftMessage, 'authorId'>): DraftMessage => {
+  return {
+    content,
+    roomId,
+    authorId: systemUser.id,
+  };
+};

services/api/src/domain/entities/user.entity.ts → services/api/src/domain/entities/users/user.entity.ts

@@ -3,8 +3,3 @@ export class User {
   name: string;
   picture?: string;
 }
-
-export const systemUser = {
-  id: 'system',
-  name: 'System',
-};

services/api/src/domain/usecases/auth.service.ts

@@ -1,4 +1,4 @@
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { Logger } from './logger';
 import { UnauthorizedException } from '@nestjs/common';
 import { isNil, reject } from 'rambda';

services/api/src/domain/usecases/commands/help.spec.ts

@@ -1,7 +1,7 @@
 import { HelpCommandUseCase } from './help';
 import { MockProxy, mock } from 'jest-mock-extended';
 import { Dispatcher } from '@entities/messages';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { UserFactory } from '@fixtures/messages/user.factory';
 import { RoomFactory } from '@fixtures/messages/room.factory';
 

services/api/src/domain/usecases/commands/help.ts

@@ -1,5 +1,5 @@
 import { Dispatcher } from '@entities/messages';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { Injectable } from '@nestjs/common';
 import { parsers } from './parse/parsers';
 

services/api/src/domain/usecases/commands/lorem.spec.ts

@@ -1,7 +1,7 @@
 import { LoremCommandUseCase, LoremGenerator, LoremParams } from './lorem';
 import { MockProxy, mock } from 'jest-mock-extended';
 import { Dispatcher } from '@entities/messages';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { RoomFactory } from '@fixtures/messages/room.factory';
 import { UserFactory } from '@fixtures/messages/user.factory';
 

services/api/src/domain/usecases/commands/lorem.ts

@@ -1,5 +1,5 @@
 import { Dispatcher, DraftMessage } from '@entities/messages';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { Injectable } from '@nestjs/common';
 
 export type LoremType = 'words' | 'paragraphs';

services/api/src/domain/usecases/messages/get-messages.ts

@@ -1,6 +1,6 @@
 import { Role, AuthService } from '@usecases/auth.service';
 import { RoomsRepository } from '@entities/rooms.repository';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { Injectable } from '@nestjs/common';
 import { pipe, reject } from 'rambda';
 import { MessagesRepository, SentMessage, isPrivate } from '@entities/messages';

services/api/src/domain/usecases/messages/send.ts

@@ -1,6 +1,6 @@
 import { Dispatcher, DraftMessage } from '@entities/messages';
 import { RoomsRepository } from '@entities/rooms.repository';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { Injectable } from '@nestjs/common';
 import { Role, AuthService } from '@usecases/auth.service';
 

services/api/src/domain/usecases/rooms/create.ts

@@ -2,7 +2,7 @@ import { MembershipStatus } from '@entities/membership.entity';
 import { MembershipsRepository } from '@entities/memberships.repository';
 import { ContentPolicy, JoinPolicy, Room } from '@entities/room.entity';
 import { RoomsRepository } from '@entities/rooms.repository';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { faker } from '@faker-js/faker';
 import { Injectable } from '@nestjs/common';
 

services/api/src/domain/usecases/rooms/get.ts

@@ -1,7 +1,7 @@
 import { AuthService, Role } from '@usecases/auth.service';
 import { Room } from '@entities/room.entity';
 import { RoomsRepository } from '@entities/rooms.repository';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { Injectable } from '@nestjs/common';
 
 export type RoomDetails = {

services/api/src/domain/usecases/rooms/join.ts

@@ -2,7 +2,7 @@ import { AuthService, Role } from '@usecases/auth.service';
 import { MembershipStatus } from '@entities/membership.entity';
 import { MembershipsRepository } from '@entities/memberships.repository';
 import { RoomsRepository } from '@entities/rooms.repository';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { Injectable } from '@nestjs/common';
 import { Dispatcher, DraftMessage } from '@entities/messages/message';
 

services/api/src/domain/usecases/rooms/rename.ts

@@ -1,7 +1,7 @@
 import { AuthService, Role } from '@usecases/auth.service';
 import { Dispatcher, DraftMessage } from '@entities/messages';
 import { RoomsRepository } from '@entities/rooms.repository';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { Injectable } from '@nestjs/common';
 
 export type RenameRoomParams = {

services/api/src/domain/usecases/users/rename.ts

@@ -1,6 +1,6 @@
 import { Dispatcher, DraftMessage } from '@entities/messages';
-import { User } from '@entities/user.entity';
-import { UsersRepository } from '@entities/users.repository';
+import { User } from '@entities/users';
+import { UsersRepository } from '@entities/users';
 import { Injectable } from '@nestjs/common';
 
 export type RenameUserParams = {

services/api/src/fixtures/auth/FakeAuth.ts

@@ -6,8 +6,8 @@ import {
 } from '@nestjs/common';
 import { faker } from '@faker-js/faker';
 import { AuthInfoFactory } from '@fixtures/auth/auth-info.factory';
-import { User } from '@entities/user.entity';
-import { userParamsFromAuth } from '@entities/users.repository';
+import { User } from '@entities/users';
+import { userParamsFromAuth } from '@entities/users';
 import { ExecutionContext } from '@nestjs/common';
 import { IdentifyService } from '@app/auth/auth0/identify.service';
 import { ModuleRef } from '@nestjs/core';

services/api/src/fixtures/data/test.data.module.ts

@@ -1,7 +1,7 @@
 import { MembershipsRepository } from '@entities/memberships.repository';
 import { MessagesRepository } from '@entities/messages';
 import { RoomsRepository } from '@entities/rooms.repository';
-import { UsersRepository } from '@entities/users.repository';
+import { UsersRepository } from '@entities/users';
 import { Global, Module } from '@nestjs/common';
 import { TestMembershipsRepository } from './test.memberships.repository';
 import { TestMessagesRepository } from './test.messages.repository';

services/api/src/fixtures/data/test.users.repository.ts

@@ -1,7 +1,7 @@
 import { find, reject } from 'rambda';
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { AuthInfo } from '@entities/auth';
-import { UpdateUserParams, UsersRepository } from '@entities/users.repository';
+import { UpdateUserParams, UsersRepository } from '@entities/users';
 import { NotFoundException } from '@nestjs/common';
 
 export class TestUsersRepository extends UsersRepository {

services/api/src/fixtures/messages/user.factory.ts

@@ -1,4 +1,4 @@
-import { User } from '@entities/user.entity';
+import { User } from '@entities/users';
 import { faker } from '@faker-js/faker';
 
 export const UserFactory = {