some more cleanup

packages/bookshop/srv/external.cds

@@ -8,8 +8,7 @@ extend service API_BUSINESS_PARTNER with {
   /**
    * Simplified view on external addresses
    */
-  @mashup @cds.autoexpose //> for ValueHelps
-  entity Addresses as projection on external.A_BusinessPartnerAddress {
+  @mashup entity Addresses as projection on external.A_BusinessPartnerAddress {
     key AddressID as ID,
     key BusinessPartner,
     Country as country,
@@ -35,15 +34,15 @@ extend service API_BUSINESS_PARTNER with {
  * Mashup w/ services to also serve shipping addresses
  */
 using { AdminService } from './admin-service';
-extend service AdminService {
-  // entity usersAddresses as projection on external.Addresses;
+extend service AdminService { // for ValueHelps from S/4 backend
+  @readonly entity usersAddresses as projection on external.Addresses;
 }
 
 // TODO: not used so far...
 using { CatalogService } from './cat-service';
-extend service CatalogService {
-  @readonly @requires:'authenticated-user'
-  entity usersAddresses as projection on external.Addresses;
+extend service CatalogService { // for ValueHelps from S/4 backend
+  @requires:'authenticated-user'
+  @readonly entity usersAddresses as projection on external.Addresses;
 }
 
 
@@ -52,13 +51,6 @@ extend service CatalogService {
  */
 using { sap.capire.bookshop } from '../db/schema';
 
-/**
- * Extend Orders to maintain references to (replicated) external Addresses
- */
-extend bookshop.Orders with {
-  shippingAddress : Association to bookshop.Addresses;
-}
-
 /**
  * Add an entity to replicate external address data for quick access,
  * e.g. when displaying lists of orders.
@@ -67,3 +59,10 @@ extend bookshop.Orders with {
 entity sap.capire.bookshop.Addresses as SELECT from external.Addresses { *,
   false as tombstone : Boolean
 };
+
+/**
+ * Extend Orders to with references to replicated external Addresses
+ */
+extend bookshop.Orders with {
+  shippingAddress : Association to bookshop.Addresses;
+}