diff --git a/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java b/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java index 0b4a20d9769..fb6b358dca1 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java +++ b/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); diff --git a/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java index ef3a6e514f1..7baca4c9525 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java +++ b/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", "standard") .build())); } diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_anchor_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_anchor_response_stdv1.xml index 22dd8fe96e6..f0dfe5543dc 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_anchor_response_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_anchor_response_stdv1.xml @@ -27,6 +27,7 @@ USD example1.tld + standard 1 0.00 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_response_stdv1.xml index 66bbf38753a..810116b837a 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_response_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_response_stdv1.xml @@ -25,6 +25,7 @@ USD example2.example + standard 1 6.50 @@ -32,6 +33,7 @@ example1.tld + standard 1 6.50 @@ -54,6 +56,7 @@ example1.tld + standard 1 11.00 @@ -61,6 +64,7 @@ example2.example + standard 1 11.00 @@ -68,6 +72,7 @@ reserved.tld + standard 1 11.00 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_specificuse_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_specificuse_response_stdv1.xml index dfb2e943630..0c5f9ba4894 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_specificuse_response_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_allocationtoken_fee_specificuse_response_stdv1.xml @@ -48,6 +48,7 @@ specificuse.tld + standard 1 13.00 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_stdv1.xml index 3db2223e932..2b91570c74c 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_stdv1.xml @@ -22,6 +22,7 @@ USD example1.tld + standard 1 13.00 @@ -30,6 +31,7 @@ example2.tld + standard 1 13.00 @@ -38,6 +40,7 @@ example3.tld + standard 1 13.00 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_fractional_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_fractional_response_stdv1.xml index 1bb852ea1e6..81804fd37de 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_fractional_response_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_fractional_response_stdv1.xml @@ -15,6 +15,7 @@ USD example1.tld + standard 1 11.10 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_allocationtoken_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_allocationtoken_response_stdv1.xml index 38fb1f0a76d..4e59ea32e18 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_allocationtoken_response_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_allocationtoken_response_stdv1.xml @@ -15,6 +15,7 @@ USD example1.tld + standard 1 11.70 @@ -22,6 +23,7 @@ example1.tld + standard 1 11.00 @@ -29,6 +31,7 @@ example1.tld + standard 1 11.00 @@ -36,6 +39,7 @@ example1.tld + standard 1 17.00 @@ -43,6 +47,7 @@ example1.tld + standard 1 0.00 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_default_token_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_default_token_response_stdv1.xml index 590b1cabe0e..6187d23bc72 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_default_token_response_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_default_token_response_stdv1.xml @@ -15,6 +15,7 @@ USD example1.tld + standard 1 6.50 @@ -22,6 +23,7 @@ example1.tld + standard 1 11.00 @@ -29,6 +31,7 @@ example1.tld + standard 1 11.00 @@ -36,6 +39,7 @@ example1.tld + standard 1 17.00 @@ -43,6 +47,7 @@ example1.tld + standard 1 0.00 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_response_stdv1.xml index 9d94d941e4a..fa9a5cc2276 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_response_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_response_stdv1.xml @@ -15,6 +15,7 @@ USD example1.tld + standard 1 13.00 @@ -22,6 +23,7 @@ example1.tld + standard 1 11.00 @@ -29,6 +31,7 @@ example1.tld + standard 1 11.00 @@ -36,6 +39,7 @@ example1.tld + standard 1 17.00 @@ -43,6 +47,7 @@ example1.tld + standard 1 0.00 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1.xml index 4a02a3e34c8..63bb90e291a 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1.xml @@ -39,6 +39,7 @@ rich.example + standard 1 17.00 @@ -46,6 +47,7 @@ rich.example + standard 1 0.00 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_renew_only.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_renew_only.xml index 78aa5054b2a..dfe612a1d81 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_renew_only.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_renew_only.xml @@ -16,6 +16,7 @@ USD rich.example + standard 1 %RENEWPRICE% diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_with_renewal.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_with_renewal.xml index 128199fddfb..98fe5b4e6f8 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_with_renewal.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_with_renewal.xml @@ -49,6 +49,7 @@ rich.example + standard 1 0.00 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_dupes_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_dupes_response_stdv1.xml index 2e2fdc3c46b..b8eaaaa2e09 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_dupes_response_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_dupes_response_stdv1.xml @@ -35,6 +35,7 @@ reserved.tld + standard 1 11.00 @@ -42,6 +43,7 @@ reserved.tld + standard 1 11.00 @@ -49,6 +51,7 @@ reserved.tld + standard 1 17.00 @@ -63,6 +66,7 @@ allowedinsunrise.tld + standard 1 11.00 @@ -70,6 +74,7 @@ allowedinsunrise.tld + standard 1 11.00 @@ -77,6 +82,7 @@ allowedinsunrise.tld + standard 1 17.00 @@ -107,6 +113,7 @@ premiumcollision.tld + standard 1 17.00 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_stdv1.xml index ea53d3534b2..72c66e82699 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_stdv1.xml @@ -35,6 +35,7 @@ reserved.tld + standard 1 11.00 @@ -42,6 +43,7 @@ reserved.tld + standard 1 11.00 @@ -49,6 +51,7 @@ reserved.tld + standard 1 17.00 @@ -63,6 +66,7 @@ allowedinsunrise.tld + standard 1 11.00 @@ -70,6 +74,7 @@ allowedinsunrise.tld + standard 1 11.00 @@ -77,6 +82,7 @@ allowedinsunrise.tld + standard 1 17.00 @@ -91,6 +97,7 @@ collision.tld + standard 1 11.00 @@ -98,6 +105,7 @@ collision.tld + standard 1 11.00 @@ -105,6 +113,7 @@ collision.tld + standard 1 17.00 @@ -135,6 +144,7 @@ premiumcollision.tld + standard 1 17.00 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_stdv1.xml index 29c0c6bcd4e..5eed1135220 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_stdv1.xml @@ -32,6 +32,7 @@ reserved.tld + standard 1 11.00 @@ -39,6 +40,7 @@ reserved.tld + standard 1 11.00 @@ -46,6 +48,7 @@ reserved.tld + standard 1 17.00 @@ -53,6 +56,7 @@ allowedinsunrise.tld + standard 1 11.05 @@ -60,6 +64,7 @@ allowedinsunrise.tld + standard 1 11.00 @@ -67,6 +72,7 @@ allowedinsunrise.tld + standard 1 11.00 @@ -74,6 +80,7 @@ allowedinsunrise.tld + standard 1 17.00 @@ -81,7 +88,7 @@ collision.tld - collision + standard-collision 1 11.05 @@ -89,7 +96,7 @@ collision.tld - collision + standard-collision 1 11.00 @@ -97,7 +104,7 @@ collision.tld - collision + standard-collision 1 11.00 @@ -105,7 +112,7 @@ collision.tld - collision + standard-collision 1 17.00 @@ -137,7 +144,7 @@ premiumcollision.tld - collision + standard-collision 1 17.00 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_default_token_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_default_token_stdv1.xml index ef7e8e6c600..1a04822d933 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_default_token_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_default_token_stdv1.xml @@ -22,6 +22,7 @@ USD example1.tld + standard 1 6.50 @@ -29,6 +30,7 @@ example2.tld + standard 1 6.50 @@ -36,6 +38,7 @@ example3.tld + standard 1 6.50 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_domain_exists_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_domain_exists_stdv1.xml index 1563d0e4a91..415faacfdc5 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_domain_exists_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_domain_exists_stdv1.xml @@ -24,6 +24,7 @@ rich.example + standard 1 %RENEWPRICE% @@ -31,6 +32,7 @@ rich.example + standard 1 %RENEWPRICE% @@ -38,6 +40,7 @@ rich.example + standard 1 17.00 @@ -45,6 +48,7 @@ rich.example + standard 1 0.00 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_domain_exists_stdv1_renew_only.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_domain_exists_stdv1_renew_only.xml index 6a3323e6823..ec126b6d601 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_domain_exists_stdv1_renew_only.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_domain_exists_stdv1_renew_only.xml @@ -16,6 +16,7 @@ USD rich.example + standard 1 %RENEWPRICE% diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_domain_exists_stdv1_transfer_only.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_domain_exists_stdv1_transfer_only.xml index 9249a957562..82d12d103a4 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_domain_exists_stdv1_transfer_only.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_domain_exists_stdv1_transfer_only.xml @@ -16,6 +16,7 @@ USD rich.example + standard 1 %RENEWPRICE% diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_stdv1.xml index c592a8a8a22..8da521b583e 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_stdv1.xml @@ -22,6 +22,7 @@ USD example1.tld + standard 1 13.00 @@ -29,6 +30,7 @@ example2.tld + standard 1 13.00 @@ -36,6 +38,7 @@ example3.tld + standard 1 13.00 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_thirty_domains_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_thirty_domains_stdv1.xml index c48188d668a..b024f1b8482 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_thirty_domains_stdv1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_thirty_domains_stdv1.xml @@ -131,6 +131,7 @@ USD example-00.tld + standard 1 17.00 @@ -138,6 +139,7 @@ example-01.tld + standard 1 17.00 @@ -146,6 +148,7 @@ example-02.tld + standard 1 17.00 @@ -154,6 +157,7 @@ example-03.tld + standard 1 17.00 @@ -162,6 +166,7 @@ example-04.tld + standard 1 17.00 @@ -170,6 +175,7 @@ example-05.tld + standard 1 17.00 @@ -178,6 +184,7 @@ example-06.tld + standard 1 17.00 @@ -186,6 +193,7 @@ example-07.tld + standard 1 17.00 @@ -194,6 +202,7 @@ example-08.tld + standard 1 17.00 @@ -202,6 +211,7 @@ example-09.tld + standard 1 17.00 @@ -210,6 +220,7 @@ example-10.tld + standard 1 17.00 @@ -218,6 +229,7 @@ example-11.tld + standard 1 17.00 @@ -226,6 +238,7 @@ example-12.tld + standard 1 17.00 @@ -234,6 +247,7 @@ example-13.tld + standard 1 17.00 @@ -242,6 +256,7 @@ example-14.tld + standard 1 17.00 @@ -250,6 +265,7 @@ example-15.tld + standard 1 17.00 @@ -258,6 +274,7 @@ example-16.tld + standard 1 17.00 @@ -266,6 +283,7 @@ example-17.tld + standard 1 17.00 @@ -274,6 +292,7 @@ example-18.tld + standard 1 17.00 @@ -282,6 +301,7 @@ example-19.tld + standard 1 17.00 @@ -290,6 +310,7 @@ example-20.tld + standard 1 17.00 @@ -298,6 +319,7 @@ example-21.tld + standard 1 17.00 @@ -306,6 +328,7 @@ example-22.tld + standard 1 17.00 @@ -314,6 +337,7 @@ example-23.tld + standard 1 17.00 @@ -322,6 +346,7 @@ example-24.tld + standard 1 17.00 @@ -330,6 +355,7 @@ example-25.tld + standard 1 17.00 @@ -338,6 +364,7 @@ example-26.tld + standard 1 17.00 @@ -346,6 +373,7 @@ example-27.tld + standard 1 17.00 @@ -354,6 +382,7 @@ example-28.tld + standard 1 17.00 @@ -362,6 +391,7 @@ example-29.tld + standard 1 17.00