Include fee:class in all Fee-1.0 responses

core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java

@@ -88,6 +88,7 @@
 import google.registry.model.domain.fee.FeeQueryResponseExtensionItem;
 import google.registry.model.domain.fee.FeeTransformCommandExtension;
 import google.registry.model.domain.fee.FeeTransformResponseExtension;
+import google.registry.model.domain.feestdv1.FeeCheckResponseExtensionItemStdV1;
 import google.registry.model.domain.launch.LaunchCreateExtension;
 import google.registry.model.domain.launch.LaunchExtension;
 import google.registry.model.domain.launch.LaunchNotice;
@@ -683,12 +684,15 @@ static void handleFeeRequest(
           tld.getTldState(now).equals(START_DATE_SUNRISE)
               && getReservationTypes(domainName).contains(NAME_COLLISION);
       boolean isPremium = fees.stream().anyMatch(BaseFee::isPremium);
+      boolean isFeeStdV1 = builder instanceof FeeCheckResponseExtensionItemStdV1.Builder;
+      String standardFee = isFeeStdV1 ? "standard" : null;
       feeClass =
           emptyToNull(
               Joiner.on('-')
                   .skipNulls()
                   .join(
-                      isPremium ? "premium" : null, isNameCollisionInSunrise ? "collision" : null));
+                      isPremium ? "premium" : standardFee,
+                      isNameCollisionInSunrise ? "collision" : null));
     }
     builder.setClass(feeClass);
 

core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java

@@ -536,7 +536,7 @@ void testSuccess_allocationTokenPromotion_multiYear_stdv1() throws Exception {
                 .put("COST_1YR", "7.23")
                 .put("COST_2YR", "13.34")
                 .put("COST_5YR", "46.34")
-                .put("FEE_CLASS", "")
+                .put("FEE_CLASS", "<fee:class>standard</fee:class>")
                 .build()));
   }
 

core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_anchor_response_stdv1.xml

@@ -27,6 +27,7 @@
         <fee:currency>USD</fee:currency>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="create">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="create">0.00</fee:fee>

core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_response_stdv1.xml

@@ -25,13 +25,15 @@
         <fee:currency>USD</fee:currency>
         <fee:cd>
           <fee:objID>example2.example</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="create">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="create">6.50</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="create">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="create">6.50</fee:fee>
@@ -54,20 +56,23 @@
         </fee:cd>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="renew">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="renew">11.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>example2.example</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="renew">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="renew">11.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>reserved.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="renew">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="renew">11.00</fee:fee>

core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_specificuse_response_stdv1.xml

@@ -48,6 +48,7 @@
         </fee:cd>
         <fee:cd>
           <fee:objID>specificuse.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="create">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="create">13.00</fee:fee>

core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_stdv1.xml

@@ -22,6 +22,7 @@
         <fee:currency>USD</fee:currency>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="create">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="create">13.00</fee:fee>
@@ -30,6 +31,7 @@
         </fee:cd>
         <fee:cd>
           <fee:objID>example2.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="create">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="create">13.00</fee:fee>
@@ -38,6 +40,7 @@
         </fee:cd>
         <fee:cd>
           <fee:objID>example3.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="create">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="create">13.00</fee:fee>

core/src/test/resources/google/registry/flows/domain/domain_check_fee_fractional_response_stdv1.xml

@@ -15,6 +15,7 @@
         <fee:currency>USD</fee:currency>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="create">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="create">11.10</fee:fee>

core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_allocationtoken_response_stdv1.xml

@@ -15,34 +15,39 @@
         <fee:currency>USD</fee:currency>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="create">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="create">11.70</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="renew">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="renew">11.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="transfer">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="renew">11.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="restore">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="restore">17.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="update">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="update">0.00</fee:fee>

core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_default_token_response_stdv1.xml

@@ -15,34 +15,39 @@
         <fee:currency>USD</fee:currency>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="create">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="create">6.50</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="renew">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="renew">11.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="transfer">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="renew">11.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="restore">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="restore">17.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="update">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="update">0.00</fee:fee>

core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_response_stdv1.xml

@@ -15,34 +15,39 @@
         <fee:currency>USD</fee:currency>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="create">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="create">13.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="renew">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="renew">11.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="transfer">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="renew">11.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="restore">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="restore">17.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>example1.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="update">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="update">0.00</fee:fee>

core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1.xml

@@ -39,13 +39,15 @@
         </fee:cd>
         <fee:cd>
           <fee:objID>rich.example</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="restore">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="restore">17.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>rich.example</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="update">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="update">0.00</fee:fee>

core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_renew_only.xml

@@ -16,6 +16,7 @@
         <fee:currency>USD</fee:currency>
         <fee:cd>
           <fee:objID>rich.example</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="renew">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="renew">%RENEWPRICE%</fee:fee>

core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_with_renewal.xml

@@ -49,6 +49,7 @@
         </fee:cd>
         <fee:cd>
           <fee:objID>rich.example</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="update">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="update">0.00</fee:fee>

core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_dupes_response_stdv1.xml

@@ -35,20 +35,23 @@
         </fee:cd>
         <fee:cd>
           <fee:objID>reserved.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="renew">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="renew">11.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>reserved.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="transfer">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="renew">11.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>reserved.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="restore">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="restore">17.00</fee:fee>
@@ -63,20 +66,23 @@
         </fee:cd>
         <fee:cd>
           <fee:objID>allowedinsunrise.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="renew">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="renew">11.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>allowedinsunrise.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="transfer">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="renew">11.00</fee:fee>
           </fee:command>
         </fee:cd>
         <fee:cd>
           <fee:objID>allowedinsunrise.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="restore">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="restore">17.00</fee:fee>
@@ -107,6 +113,7 @@
         </fee:cd>
         <fee:cd>
           <fee:objID>premiumcollision.tld</fee:objID>
+          <fee:class>standard</fee:class>
           <fee:command name="restore">
             <fee:period unit="y">1</fee:period>
             <fee:fee description="restore">17.00</fee:fee>