[OFBiz] SVN: r7778 - trunk/applications/product/entitydef

[jonesde@svn.ofbiz.org]

Author: jonesde
Date: 2006-06-13 01:55:04 -0500 (Tue, 13 Jun 2006)
New Revision: 7778

Modified:
   trunk/applications/product/entitydef/entitygroup.xml
   trunk/applications/product/entitydef/entitymodel.xml
Log:
Added ProductSubscriptionResource entity which is a more flexible alternative to the ProductContent entity which ties into the Subscription data model, which in turn ties into the Content data model is needed

Modified: trunk/applications/product/entitydef/entitygroup.xml
===================================================================
--- trunk/applications/product/entitydef/entitygroup.xml	2006-06-12 23:39:31 UTC (rev 7777)
+++ trunk/applications/product/entitydef/entitygroup.xml	2006-06-13 06:55:04 UTC (rev 7778)
@@ -170,6 +170,7 @@
     <entity-group group="org.ofbiz" entity="ProductReview" />
     <entity-group group="org.ofbiz" entity="ProductSearchConstraint" />
     <entity-group group="org.ofbiz" entity="ProductSearchResult" />
+    <entity-group group="org.ofbiz" entity="ProductSubscriptionResource" />
     <entity-group group="org.ofbiz" entity="ProductType" />
     <entity-group group="org.ofbiz" entity="ProductTypeAttr" />
     <entity-group group="org.ofbiz" entity="ProductVirtualAndAssocPrices" />

Modified: trunk/applications/product/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/product/entitydef/entitymodel.xml	2006-06-12 23:39:31 UTC (rev 7777)
+++ trunk/applications/product/entitydef/entitymodel.xml	2006-06-13 06:55:04 UTC (rev 7778)
@@ -2006,8 +2006,8 @@
       <field name="useTime" type="numeric"></field>
       <field name="useTimeUomId" type="id"></field>
       <field name="useRoleTypeId" type="id"></field>
+      <prim-key field="productId"/>
       <prim-key field="contentId"/>
-      <prim-key field="productId"/>
       <prim-key field="productContentTypeId"/>
       <prim-key field="fromDate"/>
       <relation type="one" fk-name="PROD_CNT_PROD" rel-entity-name="Product">
@@ -2276,6 +2276,34 @@
         <key-map field-name="visitId"/>
       </relation>
     </entity>
+    <entity entity-name="ProductSubscriptionResource" package-name="org.ofbiz.product.product" 
+        title="Product Subscription Resource Entity">
+        <field name="productId" type="id-ne"></field>
+        <field name="subscriptionResourceId" type="id-ne"></field>
+        <field name="fromDate" type="date-time"></field>
+        <field name="thruDate" type="date-time"></field>
+        <field name="purchaseFromDate" type="date-time"></field>
+        <field name="purchaseThruDate" type="date-time"></field>
+        <field name="useCountLimit" type="numeric"></field>
+        <field name="useTime" type="numeric"></field>
+        <field name="useTimeUomId" type="id"></field>
+        <field name="useRoleTypeId" type="id"></field>
+        <prim-key field="productId"/>
+        <prim-key field="subscriptionResourceId"/>
+        <prim-key field="fromDate"/>
+        <relation type="one" fk-name="PROD_SBRS_PROD" rel-entity-name="Product">
+            <key-map field-name="productId"/>
+        </relation>
+        <relation type="one" fk-name="PROD_SBRS_SBRS" rel-entity-name="SubscriptionResource">
+            <key-map field-name="subscriptionResourceId"/>
+        </relation>
+        <relation type="one" fk-name="PROD_SBRS_URT" title="Use" rel-entity-name="RoleType">
+            <key-map field-name="useRoleTypeId" rel-field-name="roleTypeId"/>
+        </relation>
+        <relation type="one" fk-name="PROD_SBRS_UTU" title="UseTime" rel-entity-name="Uom">
+            <key-map field-name="useTimeUomId" rel-field-name="uomId"/>
+        </relation>
+    </entity>
     <entity entity-name="ProductType"
             package-name="org.ofbiz.product.product"
             title="Product Type Entity" default-resource-name="ProductEntityLabels">