feat: show menu for multiple days for canteens and cafes

Closes #19, #79

src/app/modules/menu/context/context-menu.component.spec.ts

@@ -21,7 +21,7 @@ import {TranslateModule,} from '@ngx-translate/core';
 import {SCFacet, SCThingType} from '@openstapps/core';
 import {ContextMenuComponent} from './context-menu.component';
 import {SettingsModule} from '../../settings/settings.module';
-import {MenuService} from '../menu.service';
+import {ContextMenuService} from '../context/context-menu.service';
 import {FilterContext, SortContext} from './context-type';
 
 describe('ContextMenuComponent', async () => {
@@ -36,7 +36,7 @@ describe('ContextMenuComponent', async () => {
         ChildrenOutletContexts,
         Location,
         UrlSerializer,
-        MenuService,
+        ContextMenuService,
         {provide: LocationStrategy, useClass: PathLocationStrategy},
         {provide: APP_BASE_HREF, useValue: '/'},
       ],

src/app/modules/menu/context/context-menu.component.ts

@@ -20,8 +20,9 @@ import {
   SCThingType,
   SCTranslations,
 } from '@openstapps/core';
-import {MenuService} from '../menu.service';
+import {ContextMenuService} from './context-menu.service';
 import {FilterContext, SortContext, SortContextOption} from './context-type';
+import {Subscription} from 'rxjs';
 
 /**
  * The context menu
@@ -68,30 +69,45 @@ export class ContextMenuComponent {
    */
   translator: SCThingTranslator;
 
+  /**
+   * Array of all Subscriptions
+   */
+  subscriptions: Subscription[] = [];
+
+
   constructor(private translateService: TranslateService,
-              private readonly menuService: MenuService) {
+              private readonly contextMenuService: ContextMenuService) {
     this.language = this.translateService.currentLang as keyof SCTranslations<SCLanguage>;
     this.translator = new SCThingTranslator(this.language);
 
-    this.translateService.onLangChange.subscribe((event: LangChangeEvent) => {
+    this.subscriptions.push(this.translateService.onLangChange.subscribe((event: LangChangeEvent) => {
       this.language = event.lang as keyof SCTranslations<SCLanguage>;
       this.translator = new SCThingTranslator(this.language);
-    });
+    }));
 
-    this.menuService.filterContextChanged$.subscribe((filterContext) => {
+    this.subscriptions.push(this.contextMenuService.filterContextChanged$.subscribe((filterContext) => {
       this.filterOption = filterContext;
-    });
+    }));
 
-    this.menuService.sortOptions.subscribe((sortContext) => {
+    this.subscriptions.push(this.contextMenuService.sortOptions.subscribe((sortContext) => {
       this.sortOption = sortContext;
-    });
+    }));
+  }
+
+  /**
+   * Unsubscribe from Observables
+   */
+  ngOnDestroy() {
+    for (let sub of this.subscriptions) {
+      sub.unsubscribe();
+    }
   }
 
   /**
    * Sets selected filter options and updates listener
    */
   filterChanged = () => {
-    this.menuService.contextFilterChanged(this.filterOption);
+    this.contextMenuService.contextFilterChanged(this.filterOption);
   }
 
   /**
@@ -117,7 +133,7 @@ export class ContextMenuComponent {
     option.options.forEach((filterFacet) => filterFacet.buckets.forEach((filterBucket) => {
       filterBucket.checked = false;
     }));
-    this.menuService.contextFilterChanged(this.filterOption);
+    this.contextMenuService.contextFilterChanged(this.filterOption);
   }
 
   /**
@@ -134,6 +150,6 @@ export class ContextMenuComponent {
         option.reversed = false;
       }
     }
-    this.menuService.contextSortChanged(option);
+    this.contextMenuService.contextSortChanged(option);
   }
 }

src/app/modules/menu/context/context-menu.service.spec.ts

@@ -1,17 +1,17 @@
 import {TestBed} from '@angular/core/testing';
 
-import {MenuService} from './menu.service';
+import {ContextMenuService} from './context-menu.service';
 import {SCFacet} from '@openstapps/core';
-import {FilterContext, SortContext} from './context/context-type';
+import {FilterContext, SortContext} from './context-type';
 
-describe('MenuService', () => {
-  let service: MenuService;
+describe('ContextMenuService', () => {
+  let service: ContextMenuService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [MenuService]
+      providers: [ContextMenuService]
     });
-    service = TestBed.get(MenuService);
+    service = TestBed.get(ContextMenuService);
   });
 
   it('should be created', () => {

src/app/modules/menu/context/context-menu.service.ts

@@ -15,13 +15,13 @@
 import {Injectable} from '@angular/core';
 import {SCFacet, SCFacetBucket, SCSearchFilter, SCSearchSort} from '@openstapps/core';
 import {Subject} from 'rxjs';
-import {FilterBucket, FilterContext, FilterFacet, SortContext} from './context/context-type';
+import {FilterBucket, FilterContext, FilterFacet, SortContext} from './context-type';
 
 /**
- * MenuService provides bidirectional communication of context menu options and search queries
+ * ContextMenuService provides bidirectional communication of context menu options and search queries
  */
 @Injectable()
-export class MenuService {
+export class ContextMenuService {
 
   /**
    * Local filter context object
@@ -82,9 +82,10 @@ export class MenuService {
     const filters: SCSearchFilter[] = [];
 
     filterContext.options.forEach((filterFacet) => {
+      const optionFilters: SCSearchFilter[] = [];
       filterFacet.buckets.forEach((filterBucket) => {
         if (filterBucket.checked) {
-          filters.push(
+          optionFilters.push(
             {
               arguments: {
                 field: filterFacet.field,
@@ -94,13 +95,22 @@ export class MenuService {
             });
         }
       });
+      if (optionFilters.length > 0) {
+        filters.push({
+          arguments: {
+            filters: optionFilters,
+            operation: 'or',
+          },
+          type: 'boolean',
+        });
+      }
     });
 
     if (filters.length > 0) {
       return {
         arguments: {
           filters: filters,
-          operation: 'or',
+          operation: 'and',
         },
         type: 'boolean',
       };

src/app/modules/menu/menu.module.ts

@@ -20,7 +20,7 @@ import {IonicModule} from '@ionic/angular';
 import {TranslateModule} from '@ngx-translate/core';
 import {SettingsModule} from '../settings/settings.module';
 import {ContextMenuComponent} from './context/context-menu.component';
-import {MenuService} from './menu.service';
+import {ContextMenuService} from './context/context-menu.service';
 import {NavigationComponent} from './navigation/navigation.component';
 
 /**
@@ -44,7 +44,7 @@ import {NavigationComponent} from './navigation/navigation.component';
     SettingsModule,
   ],
   providers: [
-    MenuService,
+    ContextMenuService,
   ],
 })
 export class MenuModule {}