refactor: move location from the dish to its offers

src/core/base/ThingThatCanBeOffered.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 StApps
+ * Copyright (C) 2018-2019 StApps
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation, version 3.
@@ -13,13 +13,11 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 import {SCThing, SCThingTranslatableProperties} from '../Thing';
-import {SCBuildingWithoutReferences} from '../things/Building';
 import {SCOrganizationWithoutReferences} from '../things/Organization';
 import {SCPersonWithoutReferences} from '../things/Person';
-import {SCPointOfInterestWithoutReferences} from '../things/PointOfInterest';
-import {SCRoomWithoutReferences} from '../things/Room';
 import {SCTranslations} from '../types/i18n';
 import {SCISO8601Date} from '../types/Time';
+import {SCInPlace} from './../types/Places';
 
 /**
  * A map from group name to price
@@ -51,7 +49,8 @@ export interface SCAcademicPriceGroup extends SCPriceGroup {
 /**
  * A thing without references that has a price tag
  */
-export interface SCThingThatCanBeOffered<T extends SCPriceGroup> extends SCThing {
+export interface SCThingThatCanBeOffered<T extends SCPriceGroup>
+  extends SCThing {
   /**
    * List of offers for that thing
    */
@@ -66,7 +65,8 @@ export interface SCThingThatCanBeOffered<T extends SCPriceGroup> extends SCThing
 /**
  * Offer of a thing
  */
-export interface SCThingThatCanBeOfferedOffer<T extends SCPriceGroup> {
+export interface SCThingThatCanBeOfferedOffer<T extends SCPriceGroup>
+  extends SCInPlace {
   /**
    * Availability of an offer
    */
@@ -101,7 +101,8 @@ export interface SCThingThatCanBeOfferedOffer<T extends SCPriceGroup> {
 /**
  * Translatable properties of a thing that can be offered
  */
-export interface SCThingThatCanBeOfferedTranslatableProperties extends SCThingTranslatableProperties {
+export interface SCThingThatCanBeOfferedTranslatableProperties
+  extends SCThingTranslatableProperties {
   /**
    * Availability of an offer
    */
@@ -109,20 +110,17 @@ export interface SCThingThatCanBeOfferedTranslatableProperties extends SCThingTr
 }
 
 /**
- * Possible things a provider can be
+ * Entity responsible for the offer
  */
 export type SCThingThatCanBeOfferedProvider =
-  SCBuildingWithoutReferences
   | SCOrganizationWithoutReferences
-  | SCPersonWithoutReferences
-  | SCPointOfInterestWithoutReferences
-  | SCRoomWithoutReferences;
+  | SCPersonWithoutReferences;
 
 /**
  * Availability of an Offer
  */
 export type SCThingThatCanBeOfferedAvailability =
-  'in stock'
+  | 'in stock'
   | 'out of stock'
   | 'online only'
   | 'limited availability';