Merge pull request #227 from jbrunton/refactor-entities

refactor: entity file names

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

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

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

@@ -1,4 +1,4 @@
-import { User } from '@entities/users/user.entity';
+import { User } from '@entities/users/user';
 import {
   ConsoleLogger,
   Injectable,
@@ -11,7 +11,7 @@ import { Auth0Client } from '../auth0/auth0.client';
 import {
   UsersRepository,
   userParamsFromAuth,
-} from '@entities/users/users.repository';
+} from '@entities/users/users-repository';
 
 const extractAccessToken = ExtractJwt.fromAuthHeaderAsBearerToken();
 

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/users/user.entity';
+import { User } from '@entities/users/user';
 import { IdentifyService } from './identify.service';
 
 @Injectable()

services/api/src/app/auth/casl.auth.service.ts

@@ -1,5 +1,5 @@
 import { AuthorizeParams, AuthService } from '@usecases/auth.service';
-import { MembershipsRepository } from '@entities/memberships.repository';
+import { MembershipsRepository } from '@entities/memberships/memberships-repository';
 import { ConsoleLogger, Injectable } from '@nestjs/common';
 import { defineRolesForUser } from './permissions/roles';
 

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

@@ -1,5 +1,5 @@
-import { Membership, MembershipStatus } from '@entities/membership.entity';
-import { ContentPolicy, JoinPolicy } from '@entities/room.entity';
+import { Membership, MembershipStatus } from '@entities/memberships/membership';
+import { ContentPolicy, JoinPolicy } from '@entities/rooms/room';
 import { RoomFactory } from '@fixtures/messages/room.factory';
 import { UserFactory } from '@fixtures/messages/user.factory';
 import { defineRolesForUser } from './roles';

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

@@ -3,9 +3,9 @@ import {
   Membership,
   MembershipStatus,
   getRoomsWithStatus,
-} from '@entities/membership.entity';
-import { ContentPolicy, JoinPolicy } from '@entities/room.entity';
-import { User } from '@entities/users/user.entity';
+} from '@entities/memberships/membership';
+import { ContentPolicy, JoinPolicy } from '@entities/rooms/room';
+import { User } from '@entities/users/user';
 import { Role } from '@usecases/auth.service';
 
 export const defineRolesForUser = (user: User, memberships: Membership[]) => {

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

@@ -3,9 +3,9 @@ import {
   DraftMessage,
   isPrivate,
 } from '@entities/messages/message';
-import { MessagesRepository } from '@entities/messages/messages.repository';
-import { RoomsRepository } from '@entities/rooms.repository';
-import { User } from '@entities/users/user.entity';
+import { MessagesRepository } from '@entities/messages/messages-repository';
+import { RoomsRepository } from '@entities/rooms/rooms-repository';
+import { User } from '@entities/users/user';
 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/users/user.entity';
+import { Command } from '@entities/command';
+import { User } from '@entities/users/user';
 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,18 +9,18 @@ import {
   resetFakeAuthUsers,
 } from '@fixtures/auth/FakeAuth';
 import { MessageFactory } from '@fixtures/messages/message.factory';
-import { UsersRepository } from '@entities/users/users.repository';
-import { MessagesRepository } from '@entities/messages/messages.repository';
+import { UsersRepository } from '@entities/users/users-repository';
+import { MessagesRepository } from '@entities/messages/messages-repository';
 import { TestUsersRepository } from '@data/repositories/test/test.users.repository';
 import { TestMessagesRepository } from '@data/repositories/test/test.messages.repository';
-import { Room } from '@entities/room.entity';
-import { RoomsRepository } from '@entities/rooms.repository';
+import { Room } from '@entities/rooms/room';
+import { RoomsRepository } from '@entities/rooms/rooms-repository';
 import { TestRoomsRepository } from '@data/repositories/test/test.rooms.repository';
 import { RoomFactory } from '@fixtures/messages/room.factory';
 import { CreateMessageDto } from './dto/messages';
 import { TestMembershipsRepository } from '@data/repositories/test/test.memberships.repository';
-import { MembershipsRepository } from '@entities/memberships.repository';
-import { MembershipStatus } from '@entities/membership.entity';
+import { MembershipsRepository } from '@entities/memberships/memberships-repository';
+import { MembershipStatus } from '@entities/memberships/membership';
 import { MessagesModule } from './messages.module';
 import { Auth0Client } from '@app/auth/auth0/auth0.client';
 import { MockLoggerModule } from '@fixtures/MockLoggerModule';

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

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

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

@@ -2,13 +2,13 @@ import { MessagesService } from './messages.service';
 import { CreateMessageDto } from './dto/messages';
 import { UserFactory } from '@fixtures/messages/user.factory';
 import { RoomFactory } from '@fixtures/messages/room.factory';
-import { User } from '@entities/users/user.entity';
+import { User } from '@entities/users/user';
 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 { Command } from '@entities/command';
 import { UnauthorizedException } from '@nestjs/common';
-import { systemUser } from '@entities/users/system';
+import { systemUser } from '@entities/users/system-user';
 
 describe('MessagesService', () => {
   let service: MessagesService;

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

@@ -3,8 +3,8 @@ import { CreateMessageDto } from './dto/messages';
 import { SendMessageUseCase } from '@usecases/messages/send';
 import { CommandService } from '@app/messages/command.service';
 import { isCommand, parseMessage } from '@usecases/messages/parse-message';
-import { systemUser } from '@entities/users/system';
-import { User } from '@entities/users/user.entity';
+import { systemUser } from '@entities/users/system-user';
+import { User } from '@entities/users/user';
 
 @Injectable()
 export class MessagesService {

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/users/user.entity';
+import { User } from '@entities/users/user';
 import { CreateRoomUseCase } from '@usecases/rooms/create';
 import { GetRoomUseCase } from '@usecases/rooms/get';
 import { JoinRoomUseCase } from '@usecases/memberships/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/users/user.entity';
+import { User } from '@entities/users/user';
 import { Controller, Get, Param } from '@nestjs/common';
 import { UsersService } from './users.service';
 

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

@@ -1,10 +1,10 @@
-import { getActiveRooms } from '@entities/membership.entity';
-import { MembershipsRepository } from '@entities/memberships.repository';
-import { Room } from '@entities/room.entity';
-import { RoomsRepository } from '@entities/rooms.repository';
-import { systemUser } from '@entities/users/system';
-import { User } from '@entities/users/user.entity';
-import { UsersRepository } from '@entities/users/users.repository';
+import { getActiveRooms } from '@entities/memberships/membership';
+import { MembershipsRepository } from '@entities/memberships/memberships-repository';
+import { Room } from '@entities/rooms/room';
+import { RoomsRepository } from '@entities/rooms/rooms-repository';
+import { systemUser } from '@entities/users/system-user';
+import { User } from '@entities/users/user';
+import { UsersRepository } from '@entities/users/users-repository';
 import { Injectable } from '@nestjs/common';
 
 @Injectable()

services/api/src/data/adapters/dynamodb/schema.ts

@@ -1,5 +1,5 @@
-import { MembershipStatus } from '@entities/membership.entity';
-import { ContentPolicy, JoinPolicy } from '@entities/room.entity';
+import { MembershipStatus } from '@entities/memberships/membership';
+import { ContentPolicy, JoinPolicy } from '@entities/rooms/room';
 import { Entity } from 'dynamodb-onetable';
 
 export const DbSchema = {

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

@@ -2,14 +2,14 @@ import { Global, Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import databaseConfig from '@config/database.config';
 import { DynamoDBMessagesRepository } from './repositories/dynamodb/dynamodb.messages.repository';
-import { RoomsRepository } from '@entities/rooms.repository';
+import { RoomsRepository } from '@entities/rooms/rooms-repository';
 import { DynamoDBUsersRepository } from './repositories/dynamodb/dynamodb.users.repository';
 import { DynamoDBAdapter } from './adapters/dynamodb/dynamodb.adapter';
 import { DynamoDBRoomsRepository } from './repositories/dynamodb/dynamodb.rooms.repository';
-import { MembershipsRepository } from '@entities/memberships.repository';
+import { MembershipsRepository } from '@entities/memberships/memberships-repository';
 import { DynamoDBMembershipsRepository } from './repositories/dynamodb/dynamodb.memberships.repository';
-import { MessagesRepository } from '@entities/messages/messages.repository';
-import { UsersRepository } from '@entities/users/users.repository';
+import { MessagesRepository } from '@entities/messages/messages-repository';
+import { UsersRepository } from '@entities/users/users-repository';
 
 export const DatabaseConfigModule = ConfigModule.forFeature(databaseConfig);
 

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

@@ -1,5 +1,5 @@
-import { MembershipStatus } from '@entities/membership.entity';
-import { CreateMembershipParams } from '@entities/memberships.repository';
+import { MembershipStatus } from '@entities/memberships/membership';
+import { CreateMembershipParams } from '@entities/memberships/memberships-repository';
 import { TestMembershipsRepository } from '@data/repositories/test/test.memberships.repository';
 import { RoomFactory } from '@fixtures/messages/room.factory';
 import { UserFactory } from '@fixtures/messages/user.factory';

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

@@ -1,6 +1,6 @@
 import { DynamoDBRoomsRepository } from '@data/repositories/dynamodb/dynamodb.rooms.repository';
-import { ContentPolicy, JoinPolicy } from '@entities/room.entity';
-import { CreateRoomParams } from '@entities/rooms.repository';
+import { ContentPolicy, JoinPolicy } from '@entities/rooms/room';
+import { CreateRoomParams } from '@entities/rooms/rooms-repository';
 import { TestRoomsRepository } from '@data/repositories/test/test.rooms.repository';
 import { Test } from '@nestjs/testing';
 import { DataModule } from '../data.module';

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

@@ -5,7 +5,7 @@ import { DataModule } from '../data.module';
 import { MockLoggerModule } from '@fixtures/MockLoggerModule';
 import { AuthInfoFactory } from '@fixtures/auth/auth-info.factory';
 import { omit } from 'remeda';
-import { userParamsFromAuth } from '@entities/users/users.repository';
+import { userParamsFromAuth } from '@entities/users/users-repository';
 
 type TestCase = {
   name: 'DynamoDBUsersRepository' | 'TestUsersRepository';

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

@@ -1,8 +1,8 @@
-import { Membership } from '@entities/membership.entity';
+import { Membership } from '@entities/memberships/membership';
 import {
   CreateMembershipParams,
   MembershipsRepository,
-} from '@entities/memberships.repository';
+} from '@entities/memberships/memberships-repository';
 import { Injectable } from '@nestjs/common';
 import { pick } from 'rambda';
 import { DynamoDBAdapter } from '../../adapters/dynamodb/dynamodb.adapter';

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

@@ -3,7 +3,7 @@ import { pick } from 'rambda';
 import { DynamoDBAdapter } from '../../adapters/dynamodb/dynamodb.adapter';
 import { DbMessage } from '../../adapters/dynamodb/schema';
 import { DraftMessage, SentMessage } from '@entities/messages/message';
-import { MessagesRepository } from '@entities/messages/messages.repository';
+import { MessagesRepository } from '@entities/messages/messages-repository';
 
 @Injectable()
 export class DynamoDBMessagesRepository extends MessagesRepository {

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

@@ -1,10 +1,10 @@
 import { subject } from '@casl/ability';
-import { Room } from '@entities/room.entity';
+import { Room } from '@entities/rooms/room';
 import {
   CreateRoomParams,
   RoomsRepository,
   UpdateRoomParams,
-} from '@entities/rooms.repository';
+} from '@entities/rooms/rooms-repository';
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { pick } from 'rambda';
 import { DynamoDBAdapter } from '../../adapters/dynamodb/dynamodb.adapter';

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

@@ -6,8 +6,8 @@ import {
   UsersRepository,
   SaveUserParams,
   UpdateUserParams,
-} from '@entities/users/users.repository';
-import { User } from '@entities/users/user.entity';
+} from '@entities/users/users-repository';
+import { User } from '@entities/users/user';
 
 @Injectable()
 export class DynamoDBUsersRepository extends UsersRepository {

services/api/src/data/repositories/test/test.memberships.repository.ts

@@ -1,8 +1,8 @@
 import {
   CreateMembershipParams,
   MembershipsRepository,
-} from '@entities/memberships.repository';
-import { Membership } from '@entities/membership.entity';
+} from '@entities/memberships/memberships-repository';
+import { Membership } from '@entities/memberships/membership';
 
 export class TestMembershipsRepository extends MembershipsRepository {
   private memberships: Membership[] = [];

services/api/src/data/repositories/test/test.messages.repository.ts

@@ -1,5 +1,5 @@
 import { SentMessage, DraftMessage } from '@entities/messages/message';
-import { MessagesRepository } from '@entities/messages/messages.repository';
+import { MessagesRepository } from '@entities/messages/messages-repository';
 import * as R from 'rambda';
 
 export class TestMessagesRepository extends MessagesRepository {

services/api/src/data/repositories/test/test.rooms.repository.ts

@@ -4,8 +4,8 @@ import {
   CreateRoomParams,
   RoomsRepository,
   UpdateRoomParams,
-} from '@entities/rooms.repository';
-import { Room } from '@entities/room.entity';
+} from '@entities/rooms/rooms-repository';
+import { Room } from '@entities/rooms/room';
 import { faker } from '@faker-js/faker';
 import { subject } from '@casl/ability';
 

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

@@ -4,8 +4,8 @@ import { NotFoundException } from '@nestjs/common';
 import {
   UsersRepository,
   UpdateUserParams,
-} from '@entities/users/users.repository';
-import { User } from '@entities/users/user.entity';
+} from '@entities/users/users-repository';
+import { User } from '@entities/users/user';
 
 export class TestUsersRepository extends UsersRepository {
   private users: User[] = [];

services/api/src/domain/entities/auth.ts

@@ -1,12 +1,12 @@
 export interface AuthInfo {
   sub: string;
   name?: string;
-  given_name?: string;
-  family_name?: string;
-  nickname?: string;
+  // given_name?: string;
+  // family_name?: string;
+  // nickname?: string;
   picture?: string;
-  locale?: string;
-  updated_at?: number | string;
+  // locale?: string;
+  // updated_at?: number | string;
   email?: string;
-  email_verified?: boolean;
+  // email_verified?: boolean;
 }

services/api/src/domain/entities/memberships.repository.ts → services/api/src/domain/entities/memberships/memberships-repository.ts

@@ -1,4 +1,4 @@
-import { Membership, MembershipStatus } from './membership.entity';
+import { Membership, MembershipStatus } from './membership';
 
 export type CreateMembershipParams = Pick<
   Membership,

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

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { User } from '../users/user.entity';
+import { User } from '../users/user';
 
 export enum UpdatedEntity {
   Room = 'room',