Feature#307

.eslintignore

@@ -1,2 +1,2 @@
-src/app/services/starter.service.*
-src/app/services/auth.service.*
+# src/app/services/starter.service.*
+# src/app/services/auth.service.*

src/app/modules/starter/components/starter/starter.component.spec.ts

@@ -5,14 +5,14 @@ import { StarterService } from 'src/app/services/starter.service'
 import { TranslateModule } from '@ngx-translate/core'
 
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'
-import { environment } from 'src/environments/environment'
 import { of } from 'rxjs'
+import { environment } from 'src/environments/environment'
 
 describe('StarterComponent', () => {
   let component: StarterComponent
   let fixture: ComponentFixture<StarterComponent>
   let starterService: StarterService
-  let httpClientMock: HttpTestingController
+  let httpMock: HttpTestingController
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -23,7 +23,7 @@ describe('StarterComponent', () => {
     component = fixture.componentInstance
     fixture.detectChanges()
     starterService = TestBed.inject(StarterService)
-    httpClientMock = TestBed.inject(HttpTestingController)
+    httpMock = TestBed.inject(HttpTestingController)
   })
 
   it('should create', () => {
@@ -40,26 +40,6 @@ describe('StarterComponent', () => {
     done()
   })
 
-  it('should call getAllChallengesOffset when sortBy empty', (done) => {
-    const mockResponse = { challenge: 'challenge' }
-    const starterServiceSpy = jest.spyOn(starterService, 'getAllChallengesOffset').mockReturnValue(of(mockResponse))
-    component.sortBy = ''
-
-    component.getChallengesByPage(1)
-
-    const req = httpClientMock.expectOne(`${environment.BACKEND_ITA_CHALLENGE_BASE_URL}${environment.BACKEND_ALL_CHALLENGES_URL}?offset=0&limit=8`)
-    expect(req.request.method).toEqual('GET')
-
-    expect(starterServiceSpy).toBeCalledWith(0, 8)
-    expect(component.listChallenges).toBe(mockResponse)
-    expect(component.totalPages).toEqual(3)
-    expect(starterService.getAllChallengesOffset).toHaveBeenCalled()
-
-    req.flush(mockResponse)
-    httpClientMock.verify()
-    done()
-  })
-
   it('should set listChallenges correctly when sortBy is empty', () => {
     const mockResponse = { challenge: 'challenge' }
     spyOn(starterService, 'getAllChallengesOffset').and.returnValue(of(mockResponse))
@@ -127,4 +107,18 @@ describe('StarterComponent', () => {
 
     expect(getChallengeFiltersSpy).toHaveBeenCalled()
   })
+
+  it('should call getAllChallengesOffset with correct parameters', () => {
+    const mockChallenges = [{ id: 1, name: 'Test Challenge' }]
+    const pageOffset = 0
+    const pageLimit = 10
+
+    starterService.getAllChallengesOffset(pageOffset, pageLimit).subscribe((challenges: any) => {
+      expect(challenges).toEqual(mockChallenges)
+    })
+
+    const req = httpMock.expectOne(`${environment.BACKEND_ITA_CHALLENGE_BASE_URL}${environment.BACKEND_ALL_CHALLENGES_URL}?offset=${pageOffset}&limit=${pageLimit}`)
+    expect(req.request.method).toBe('GET')
+    req.flush(mockChallenges)
+  })
 })

src/app/modules/starter/components/starter/starter.component.ts

@@ -1,5 +1,5 @@
 import { type FilterChallenge } from './../../../../models/filter-challenge.model'
-import { Component, Inject, ViewChild } from '@angular/core'
+import { Component, Inject, type OnInit, ViewChild } from '@angular/core'
 import { type Subscription } from 'rxjs'
 import { StarterService } from '../../../../services/starter.service'
 import { Challenge } from '../../../../models/challenge.model'
@@ -13,7 +13,7 @@ import { TranslateService } from '@ngx-translate/core'
   styleUrls: ['./starter.component.scss'],
   providers: []
 })
-export class StarterComponent {
+export class StarterComponent implements OnInit {
   @ViewChild('modal') private readonly modalContent!: FiltersModalComponent
 
   challenges: Challenge[] = []
@@ -76,7 +76,7 @@ export class StarterComponent {
   }
 
   private getAndSortChallenges (getChallengeOffset: number, resp: any): void {
-    const respArray: any[] = Array.isArray(resp) ? resp : [resp]
+    const respArray: Challenge[] = Array.isArray(resp) ? resp : [resp]
     const sortedChallenges$ = this.isAscending
       ? this.starterService.orderBySortAscending(this.sortBy, respArray, getChallengeOffset, this.pageSize)
       : this.starterService.orderBySortAsDescending(this.sortBy, respArray, getChallengeOffset, this.pageSize)
@@ -99,13 +99,17 @@ export class StarterComponent {
         if ((this.filters.languages.length > 0 && this.filters.languages.length < 4) || (this.filters.levels.length > 0 && this.filters.levels.length < 3) || (this.filters.progress.length > 0 && this.filters.progress.length < 3)) {
           const respArray: Challenge[] = Array.isArray(resp) ? resp : [resp]
           this.starterService.getAllChallengesFiltered(this.filters, respArray)
-            .subscribe(filteredResp => {
+            .subscribe((filteredResp: Challenge[]) => {
               if (this.sortBy !== '') {
                 const orderBySortFunction = this.isAscending ? this.starterService.orderBySortAscending : this.starterService.orderBySortAsDescending
-                orderBySortFunction(this.sortBy, filteredResp, getChallengeOffset, this.pageSize).subscribe(sortedResp => {
-                  this.listChallenges = sortedResp
-                  this.totalPages = Math.ceil(filteredResp.length / this.pageSize)
-                })
+                if (filteredResp.every(item => item instanceof Challenge)) {
+                  orderBySortFunction(this.sortBy, filteredResp, getChallengeOffset, this.pageSize).subscribe(sortedResp => {
+                    this.listChallenges = sortedResp
+                    this.totalPages = Math.ceil(filteredResp.length / this.pageSize)
+                  })
+                } else {
+                  console.error('filteredResp no es un array de Challenge')
+                }
               } else {
                 this.listChallenges = filteredResp.slice(getChallengeOffset, getChallengeOffset + this.pageSize)
                 this.totalPages = Math.ceil(filteredResp.length / this.pageSize)