Merge pull request #174 from Maua-Dev/homolog

Merge branch homolog -> prod - Criado Automatico

Author: Giu0601

curl_post_output.txt

@@ -3,6 +3,8 @@ import { ACTIVE } from '../../../../shared/domain/enums/active_enum'
 import { COURSE } from '../../../../shared/domain/enums/course_enum'
 import { ROLE } from '../../../../shared/domain/enums/role_enum'
 import { STACK } from '../../../../shared/domain/enums/stack_enum'
+import { Strike, type StrikeCreationResponse } from '../../../../shared/domain/entities/strike'
+import { STRIKE_CATEGORY } from '../../../../shared/domain/enums/strike_category_enum'
 
 export interface IMemberRepository {
   createMember(
@@ -15,6 +17,16 @@ export interface IMemberRepository {
     course: COURSE
   ): Promise<Member>
 
+  createStrike(
+    memberUserId: string,
+    reason: STRIKE_CATEGORY,
+    comment: string,
+    date: number,
+    ownerUserId: string // qual admin deu o strike
+  ): Promise<StrikeCreationResponse>
+
+  deleteStrike(strikeId: string): Promise<void>
+
   getMember(): Promise<Member>
 
   getAllMembers(): Promise<Member[]>
@@ -35,4 +47,7 @@ export interface IMemberRepository {
   ): Promise<Member>
 
   deleteMember(): Promise<Member>
+
+  getStrike(strikeId: string): Promise<Strike>
+  getStrike(strikeId: string): Promise<Strike>
 }

src/@clean/modules/member/domain/repositories/member_repository_interface.ts

@@ -0,0 +1,19 @@
+import type { IMemberRepository } from '../domain/repositories/member_repository_interface'
+
+export class CreateStrikeUsecase {
+  constructor(private readonly memberRepository: IMemberRepository) {}
+
+  async execute(
+    memberUserId: string,
+    reason: string,
+    comment: string,
+    date: number
+  ) {
+    return await this.memberRepository.createStrike(
+      memberUserId,
+      reason,
+      comment,
+      date
+    )
+  }
+}

src/@clean/modules/member/usecases/create_strike_usecase.ts

@@ -0,0 +1,9 @@
+import { IMemberRepository } from '../../member/domain/repositories/member_repository_interface'
+
+export class GetStrikeUsecase {
+  constructor(private repo: IMemberRepository) {}
+
+  async execute(strikeId: string) {
+    return await this.repo.getStrike(strikeId);
+  }
+}

src/@clean/modules/member/usecases/get_strike_usecase.ts

@@ -16,6 +16,9 @@ export type JsonProps = {
     course: string
     hired_date: number
     deactivated_date?: number | null
+    strikes?: number | null
+    strikes_id?: string[]
+    strikes_allowed?: number | null
     active: string
     user_id: string
     hours_worked: number | undefined
@@ -33,6 +36,9 @@ export type MemberProps = {
   role: ROLE // ENUM
   stack: STACK // ENUM
   year: number
+  strikes: number | null
+  strikesId: string[]
+  strikes_allowed: number | null
   cellphone: string
   course: COURSE // ENUM
   hiredDate: number
@@ -53,6 +59,9 @@ export class Member {
   private _stack: STACK
   private _year: number
   private _cellphone: string
+  private _strikes: number | null
+  private _strikesId: string[]
+  private _strikes_allowed: number | null
   private _course: COURSE
   private _hiredDate: number
   private _deactivatedDate?: number | null
@@ -72,6 +81,9 @@ export class Member {
     year,
     cellphone,
     course,
+    strikes,
+    strikesId,
+    strikes_allowed,
     hiredDate,
     deactivatedDate,
     active,
@@ -89,6 +101,9 @@ export class Member {
     this._year = year
     this._cellphone = cellphone
     this._course = course
+    this._strikes = strikes
+    this._strikesId = strikesId || []
+    this._strikes_allowed = strikes_allowed
     this._hiredDate = hiredDate
     this._deactivatedDate = deactivatedDate
     this._active = active
@@ -229,6 +244,28 @@ export class Member {
   set photo(photo: string | null) {
     this._photo = photo
   }
+  get strikes(): number {
+    if (this._strikes == null) return 0
+    return this._strikes
+  }
+  set strikes(strikes: number | null) {
+    this._strikes = strikes
+  }
+
+  get strikesId(): string[] {
+    return this._strikesId
+  }
+  set strikesId(strikesId: string[]) {
+    this._strikesId = strikesId
+  }
+
+  get strikes_allowed(): number {
+    if (this._strikes_allowed == null) return 0
+    return this._strikes_allowed as number
+  }
+  set strikes_allowed(strikes_allowed: number) {
+    this._strikes_allowed = strikes_allowed
+  }
 
   // JSON conversion
 
@@ -245,6 +282,9 @@ export class Member {
       course: this.course,
       hired_date: this.hiredDate,
       deactivated_date: this.deactivatedDate,
+      strikes: this.strikes,
+      strikes_id: this.strikesId,
+      strikes_allowed: this.strikes_allowed,
       active: this.active,
       user_id: this.userId,
       hours_worked: this.hoursWorked,
@@ -254,13 +294,19 @@ export class Member {
   }
 
   static fromJSON(json: JsonProps) {
+    if (json.member.strikes_id && json.member.strikes_id.length > 0) {
+      console.log(`Member ${json.member.name} has strikes_id:`, json.member.strikes_id)
+    }
     return new Member({
       name: json.member.name,
       emailDev: json.member.email_dev,
       email: json.member.email,
       ra: json.member.ra,
       role: roleToEnum(json.member.role),
       stack: stackToEnum(json.member.stack),
+      strikesId: json.member.strikes_id || [],
+      strikes: json.member.strikes ?? null,
+      strikes_allowed: json.member.strikes_allowed ?? null,
       year: json.member.year,
       cellphone: json.member.cellphone,
       course: courseToEnum(json.member.course),

src/@clean/shared/domain/entities/member.ts

@@ -228,7 +228,7 @@ export class Project {
       return false
     } else if (typeof code !== 'string') {
       return false
-    } else if (code.length !== 2) {
+    } else if (code.length < 2) {
       return false
     } else if (code !== code.toUpperCase()) {
       return false
@@ -263,7 +263,7 @@ export class Project {
       return false
     } else if (typeof userId !== 'string') {
       return false
-    } else if (userId.length !== 36) {
+    } else if (userId.length > 36) {
       return false
     }
     return true

src/@clean/shared/domain/entities/project.ts

@@ -0,0 +1,58 @@
+import { STRIKE_CATEGORY } from "../enums/strike_category_enum"
+
+export type StrikeCreationResponse = {
+  strike_id: string
+  owner_user_id: string
+  target_user_id: string
+  applier_user_id: string
+  occurred_date: number
+  category: STRIKE_CATEGORY
+  description: string
+  case_number: number
+  message: string
+}
+
+export type StrikeProps = {
+  strikeId: string
+  ownerUserId: string
+  targetUserId: string
+  applierUserId: string
+  occurredDate: number
+  category: STRIKE_CATEGORY
+  description: string
+}
+
+export class Strike {
+  constructor(public props: StrikeProps) {}
+
+  get strikeId() {
+    return this.props.strikeId
+  }
+  get ownerUserId() {
+    return this.props.ownerUserId
+  }
+  get targetUserId() {
+    return this.props.targetUserId
+  }
+  get occurredDate() {
+    return this.props.occurredDate
+  }
+  get category() {
+    return this.props.category
+  }
+  get description() {
+    return this.props.description
+  }
+
+  static fromJSON(json: any): Strike {
+    return new Strike({
+      strikeId: json.strike_id || json.strikeId || json.id || '',
+      ownerUserId: json.owner_user_id || json.ownerUserId || '',
+      targetUserId: json.target_user_id || json.targetUserId || '',
+      applierUserId: json.applier_user_id || json.applierUserId || '',
+      occurredDate: json.occurred_date || json.occurredDate || json.date || 0,
+      category: json.category || json.reason,
+      description: json.description || json.message || json.comment || ''
+    })
+  }
+}

src/@clean/shared/domain/entities/strike.ts

@@ -16,6 +16,6 @@ export function activeToEnum(value: string): ACTIVE {
     case 'DISCONNECTED':
       return ACTIVE.DISCONNECTED
     default:
-      throw new Error('Invalid value')
+      throw new Error(`Invalid active value: ${value}`)
   }
 }

src/@clean/shared/domain/enums/active_enum.ts

@@ -1,4 +1,5 @@
 export enum COURSE {
+  ADS = 'ADS',
   ADM = 'ADM',
   ARQ = 'ARQ',
   DSG = 'DSG',
@@ -51,15 +52,19 @@ export function courseToEnum(value: string): COURSE {
       return COURSE.RIN
     case 'ARQ':
       return COURSE.ARQ
+    case 'ADS':
+      return COURSE.ADS
     default:
-      throw new Error('Invalid value')
+      throw new Error(`Invalid course value: ${value}`)
   }
 }
 
 export function translateCourse(value: string): string {
   switch (value) {
     case 'ADM':
       return 'Administração'
+    case 'ADS':
+      return 'Ánalise e Desenvolvimento de Sistemas'
     case 'DSG':
       return 'Design'
     case 'ARQ':

src/@clean/shared/domain/enums/course_enum.ts

@@ -5,7 +5,8 @@ export enum ROLE {
   INTERNAL = 'INTERNAL',
   PO = 'PO',
   SCRUM = 'SCRUM',
-  DESIGNER = 'DESIGNER'
+  DESIGNER = 'DESIGNER',
+  EXTERNAL = 'EXTERNAL'
 }
 
 export function roleToEnum(value: string): ROLE {
@@ -24,8 +25,10 @@ export function roleToEnum(value: string): ROLE {
       return ROLE.SCRUM
     case 'DESIGNER':
       return ROLE.DESIGNER
+    case 'EXTERNAL':
+      return ROLE.EXTERNAL
     default:
-      throw new Error('Invalid value')
+      throw new Error(`Invalid role value: ${value}`)
   }
 }
 
@@ -45,6 +48,8 @@ export function translateRole(value: string): string {
       return 'Scrum Master'
     case 'DESIGNER':
       return 'Designer'
+    case 'EXTERNAL':
+      return 'Externo'
     default:
       return 'Invalid value'
   }