Skip to content

refactor: 🛠️ update RecipeFilterCriteria to simplify signal forms exercises #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yjaaidi merged 1 commit into from
Mar 10, 2026
Merged

refactor: 🛠️ update RecipeFilterCriteria to simplify signal forms exercises #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions apps/301-recipe-search-isolated-solution/src/app/recipe/recipe-filter-criteria.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
export interface RecipeFilterCriteria {
keywords?: string;
maxIngredientCount?: number;
maxStepCount?: number;
keywords: string;
maxIngredientCount: number | null;
maxStepCount: number | null;
}

export function createDefaultRecipeFilterCriteria(): RecipeFilterCriteria {
return {
keywords: '',
maxIngredientCount: null,
maxStepCount: null,
};
}

export function createRecipeFilterCriteria(
Expand Down
17 changes: 11 additions & 6 deletions apps/301-recipe-search-isolated-solution/src/app/recipe/recipe-repository.fake.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,23 @@ import {
} from '@angular/core';
import { defer, Observable, of } from 'rxjs';
import { Recipe } from './recipe';
import { RecipeFilterCriteria } from './recipe-filter-criteria';
import {
createDefaultRecipeFilterCriteria,
RecipeFilterCriteria,
} from './recipe-filter-criteria';
import { RecipeRepository, RecipeRepositoryDef } from './recipe-repository';

@Injectable()
export class RecipeRepositoryFake implements RecipeRepositoryDef {
private _recipes: Recipe[] = [];

search({
keywords,
maxIngredientCount,
maxStepCount,
}: RecipeFilterCriteria = {}): Observable<Recipe[]> {
search(
{
keywords,
maxIngredientCount,
maxStepCount,
}: RecipeFilterCriteria = createDefaultRecipeFilterCriteria(),
): Observable<Recipe[]> {
return defer(() => {
const recipes = this._recipes.filter((recipe) => {
const conditions = [
Expand Down
15 changes: 10 additions & 5 deletions apps/301-recipe-search-isolated-solution/src/app/recipe/recipe-repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { inject, Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { createRecipe, Recipe } from './recipe';
import { RecipeFilterCriteria } from './recipe-filter-criteria';
import {
createDefaultRecipeFilterCriteria,
RecipeFilterCriteria,
} from './recipe-filter-criteria';
import { HttpClient } from '@angular/common/http';
import { map } from 'rxjs/operators';

Expand All @@ -15,10 +18,12 @@ export interface RecipeRepositoryDef {
export class RecipeRepository implements RecipeRepositoryDef {
private _httpClient = inject(HttpClient);

search({
keywords,
maxIngredientCount,
}: RecipeFilterCriteria = {}): Observable<Recipe[]> {
search(
{
keywords,
maxIngredientCount,
}: RecipeFilterCriteria = createDefaultRecipeFilterCriteria(),
): Observable<Recipe[]> {
const params: ResponseListQueryParams = {
embed: 'ingredients',
...(keywords ? { q: keywords } : {}),
Expand Down
14 changes: 11 additions & 3 deletions apps/301-recipe-search-isolated-starter/src/app/recipe/recipe-filter-criteria.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
export interface RecipeFilterCriteria {
keywords?: string;
maxIngredientCount?: number;
maxStepCount?: number;
keywords: string;
maxIngredientCount: number | null;
maxStepCount: number | null;
}

export function createDefaultRecipeFilterCriteria(): RecipeFilterCriteria {
return {
keywords: '',
maxIngredientCount: null,
maxStepCount: null,
};
}

export function createRecipeFilterCriteria(
Expand Down
17 changes: 11 additions & 6 deletions apps/301-recipe-search-isolated-starter/src/app/recipe/recipe-repository.fake.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,23 @@ import {
} from '@angular/core';
import { defer, Observable, of } from 'rxjs';
import { Recipe } from './recipe';
import { RecipeFilterCriteria } from './recipe-filter-criteria';
import {
createDefaultRecipeFilterCriteria,
RecipeFilterCriteria,
} from './recipe-filter-criteria';
import { RecipeRepository, RecipeRepositoryDef } from './recipe-repository';

@Injectable()
export class RecipeRepositoryFake implements RecipeRepositoryDef {
private _recipes: Recipe[] = [];

search({
keywords,
maxIngredientCount,
maxStepCount,
}: RecipeFilterCriteria = {}): Observable<Recipe[]> {
search(
{
keywords,
maxIngredientCount,
maxStepCount,
}: RecipeFilterCriteria = createDefaultRecipeFilterCriteria(),
): Observable<Recipe[]> {
return defer(() => {
const recipes = this._recipes.filter((recipe) => {
const conditions = [
Expand Down
15 changes: 10 additions & 5 deletions apps/301-recipe-search-isolated-starter/src/app/recipe/recipe-repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { inject, Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { createRecipe, Recipe } from './recipe';
import { RecipeFilterCriteria } from './recipe-filter-criteria';
import {
createDefaultRecipeFilterCriteria,
RecipeFilterCriteria,
} from './recipe-filter-criteria';
import { HttpClient } from '@angular/common/http';
import { map } from 'rxjs/operators';

Expand All @@ -15,10 +18,12 @@ export interface RecipeRepositoryDef {
export class RecipeRepository implements RecipeRepositoryDef {
private _httpClient = inject(HttpClient);

search({
keywords,
maxIngredientCount,
}: RecipeFilterCriteria = {}): Observable<Recipe[]> {
search(
{
keywords,
maxIngredientCount,
}: RecipeFilterCriteria = createDefaultRecipeFilterCriteria(),
): Observable<Recipe[]> {
const params: ResponseListQueryParams = {
embed: 'ingredients',
...(keywords ? { q: keywords } : {}),
Expand Down
14 changes: 11 additions & 3 deletions ...-recipe-search-integration-browser-mode-solution/src/app/recipe/recipe-filter-criteria.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
export interface RecipeFilterCriteria {
keywords?: string;
maxIngredientCount?: number;
maxStepCount?: number;
keywords: string;
maxIngredientCount: number | null;
maxStepCount: number | null;
}

export function createDefaultRecipeFilterCriteria(): RecipeFilterCriteria {
return {
keywords: '',
maxIngredientCount: null,
maxStepCount: null,
};
}

export function createRecipeFilterCriteria(
Expand Down
17 changes: 11 additions & 6 deletions ...-recipe-search-integration-browser-mode-solution/src/app/recipe/recipe-repository.fake.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,23 @@ import {
} from '@angular/core';
import { defer, Observable, of } from 'rxjs';
import { Recipe } from './recipe';
import { RecipeFilterCriteria } from './recipe-filter-criteria';
import {
createDefaultRecipeFilterCriteria,
RecipeFilterCriteria,
} from './recipe-filter-criteria';
import { RecipeRepository, RecipeRepositoryDef } from './recipe-repository';

@Injectable()
export class RecipeRepositoryFake implements RecipeRepositoryDef {
private _recipes: Recipe[] = [];

search({
keywords,
maxIngredientCount,
maxStepCount,
}: RecipeFilterCriteria = {}): Observable<Recipe[]> {
search(
{
keywords,
maxIngredientCount,
maxStepCount,
}: RecipeFilterCriteria = createDefaultRecipeFilterCriteria(),
): Observable<Recipe[]> {
return defer(() => {
const recipes = this._recipes.filter((recipe) => {
const conditions = [
Expand Down
15 changes: 10 additions & 5 deletions apps/302-recipe-search-integration-browser-mode-solution/src/app/recipe/recipe-repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { inject, Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { createRecipe, Recipe } from './recipe';
import { RecipeFilterCriteria } from './recipe-filter-criteria';
import {
createDefaultRecipeFilterCriteria,
RecipeFilterCriteria,
} from './recipe-filter-criteria';
import { HttpClient } from '@angular/common/http';
import { map } from 'rxjs/operators';

Expand All @@ -15,10 +18,12 @@ export interface RecipeRepositoryDef {
export class RecipeRepository implements RecipeRepositoryDef {
private _httpClient = inject(HttpClient);

search({
keywords,
maxIngredientCount,
}: RecipeFilterCriteria = {}): Observable<Recipe[]> {
search(
{
keywords,
maxIngredientCount,
}: RecipeFilterCriteria = createDefaultRecipeFilterCriteria(),
): Observable<Recipe[]> {
const params: ResponseListQueryParams = {
embed: 'ingredients',
...(keywords ? { q: keywords } : {}),
Expand Down
14 changes: 11 additions & 3 deletions ...2-recipe-search-integration-browser-mode-starter/src/app/recipe/recipe-filter-criteria.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
export interface RecipeFilterCriteria {
keywords?: string;
maxIngredientCount?: number;
maxStepCount?: number;
keywords: string;
maxIngredientCount: number | null;
maxStepCount: number | null;
}

export function createDefaultRecipeFilterCriteria(): RecipeFilterCriteria {
return {
keywords: '',
maxIngredientCount: null,
maxStepCount: null,
};
}

export function createRecipeFilterCriteria(
Expand Down
17 changes: 11 additions & 6 deletions ...2-recipe-search-integration-browser-mode-starter/src/app/recipe/recipe-repository.fake.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,23 @@ import {
} from '@angular/core';
import { defer, Observable, of } from 'rxjs';
import { Recipe } from './recipe';
import { RecipeFilterCriteria } from './recipe-filter-criteria';
import {
createDefaultRecipeFilterCriteria,
RecipeFilterCriteria,
} from './recipe-filter-criteria';
import { RecipeRepository, RecipeRepositoryDef } from './recipe-repository';

@Injectable()
export class RecipeRepositoryFake implements RecipeRepositoryDef {
private _recipes: Recipe[] = [];

search({
keywords,
maxIngredientCount,
maxStepCount,
}: RecipeFilterCriteria = {}): Observable<Recipe[]> {
search(
{
keywords,
maxIngredientCount,
maxStepCount,
}: RecipeFilterCriteria = createDefaultRecipeFilterCriteria(),
): Observable<Recipe[]> {
return defer(() => {
const recipes = this._recipes.filter((recipe) => {
const conditions = [
Expand Down
15 changes: 10 additions & 5 deletions apps/302-recipe-search-integration-browser-mode-starter/src/app/recipe/recipe-repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { inject, Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { createRecipe, Recipe } from './recipe';
import { RecipeFilterCriteria } from './recipe-filter-criteria';
import {
createDefaultRecipeFilterCriteria,
RecipeFilterCriteria,
} from './recipe-filter-criteria';
import { HttpClient } from '@angular/common/http';
import { map } from 'rxjs/operators';

Expand All @@ -15,10 +18,12 @@ export interface RecipeRepositoryDef {
export class RecipeRepository implements RecipeRepositoryDef {
private _httpClient = inject(HttpClient);

search({
keywords,
maxIngredientCount,
}: RecipeFilterCriteria = {}): Observable<Recipe[]> {
search(
{
keywords,
maxIngredientCount,
}: RecipeFilterCriteria = createDefaultRecipeFilterCriteria(),
): Observable<Recipe[]> {
const params: ResponseListQueryParams = {
embed: 'ingredients',
...(keywords ? { q: keywords } : {}),
Expand Down
14 changes: 11 additions & 3 deletions .../302-recipe-search-integration-test-bed-solution/src/app/recipe/recipe-filter-criteria.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
export interface RecipeFilterCriteria {
keywords?: string;
maxIngredientCount?: number;
maxStepCount?: number;
keywords: string;
maxIngredientCount: number | null;
maxStepCount: number | null;
}

export function createDefaultRecipeFilterCriteria(): RecipeFilterCriteria {
return {
keywords: '',
maxIngredientCount: null,
maxStepCount: null,
};
}

export function createRecipeFilterCriteria(
Expand Down
17 changes: 11 additions & 6 deletions .../302-recipe-search-integration-test-bed-solution/src/app/recipe/recipe-repository.fake.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,23 @@ import {
} from '@angular/core';
import { defer, Observable, of } from 'rxjs';
import { Recipe } from './recipe';
import { RecipeFilterCriteria } from './recipe-filter-criteria';
import {
createDefaultRecipeFilterCriteria,
RecipeFilterCriteria,
} from './recipe-filter-criteria';
import { RecipeRepository, RecipeRepositoryDef } from './recipe-repository';

@Injectable()
export class RecipeRepositoryFake implements RecipeRepositoryDef {
private _recipes: Recipe[] = [];

search({
keywords,
maxIngredientCount,
maxStepCount,
}: RecipeFilterCriteria = {}): Observable<Recipe[]> {
search(
{
keywords,
maxIngredientCount,
maxStepCount,
}: RecipeFilterCriteria = createDefaultRecipeFilterCriteria(),
): Observable<Recipe[]> {
return defer(() => {
const recipes = this._recipes.filter((recipe) => {
const conditions = [
Expand Down
15 changes: 10 additions & 5 deletions apps/302-recipe-search-integration-test-bed-solution/src/app/recipe/recipe-repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { inject, Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { createRecipe, Recipe } from './recipe';
import { RecipeFilterCriteria } from './recipe-filter-criteria';
import {
createDefaultRecipeFilterCriteria,
RecipeFilterCriteria,
} from './recipe-filter-criteria';
import { HttpClient } from '@angular/common/http';
import { map } from 'rxjs/operators';

Expand All @@ -15,10 +18,12 @@ export interface RecipeRepositoryDef {
export class RecipeRepository implements RecipeRepositoryDef {
private _httpClient = inject(HttpClient);

search({
keywords,
maxIngredientCount,
}: RecipeFilterCriteria = {}): Observable<Recipe[]> {
search(
{
keywords,
maxIngredientCount,
}: RecipeFilterCriteria = createDefaultRecipeFilterCriteria(),
): Observable<Recipe[]> {
const params: ResponseListQueryParams = {
embed: 'ingredients',
...(keywords ? { q: keywords } : {}),
Expand Down
Loading
Loading