mirror of
https://github.com/google/nomulus.git
synced 2025-05-01 12:37:52 +02:00
552ab12314
This makes a few cosmetic changes that prepares the pipeline for production. Namely: - Converts file names to include the input yearMonth, mostly mirroring the original invoicing pipeline. - Factors out the yearMonth logic from the reporting module to the more common backend module. We will likely use the default yearMonth logic in other backend tasks (such as spec11 reporting). - Adds the "withTemplateCompatability" flag to the Bigquery read, which allows multiple uses of the same template. - Adds the 'billing' task queue, which retries up to 5 times every 3 minutes, which is about the rate we desire for checking if the pipeline is complete. - Adds a shell 'invoicing upload' class, which tests the retry semantics we want for post-generation work (e-mailing the invoice to crr-tech, and publishing detail reports) While this cl may look big, it's mostly just a refactor and setting up boilerplate needed to frame the upload logic. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=179849586
93 lines
3.6 KiB
Java
93 lines
3.6 KiB
Java
// Copyright 2017 The Nomulus Authors. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package google.registry.module.backend;
|
|
|
|
import static google.registry.model.registry.Registries.assertTldExists;
|
|
import static google.registry.model.registry.Registries.assertTldsExist;
|
|
import static google.registry.request.RequestParameters.extractOptionalDatetimeParameter;
|
|
import static google.registry.request.RequestParameters.extractOptionalParameter;
|
|
import static google.registry.request.RequestParameters.extractRequiredParameter;
|
|
import static google.registry.request.RequestParameters.extractSetOfParameters;
|
|
|
|
import com.google.common.collect.ImmutableSet;
|
|
import dagger.Module;
|
|
import dagger.Provides;
|
|
import google.registry.batch.ExpandRecurringBillingEventsAction;
|
|
import google.registry.request.HttpException.BadRequestException;
|
|
import google.registry.request.Parameter;
|
|
import google.registry.request.RequestParameters;
|
|
import google.registry.util.Clock;
|
|
import java.util.Optional;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import org.joda.time.DateTime;
|
|
import org.joda.time.YearMonth;
|
|
import org.joda.time.format.DateTimeFormat;
|
|
import org.joda.time.format.DateTimeFormatter;
|
|
|
|
/**
|
|
* Dagger module for injecting common settings for all Backend tasks.
|
|
*/
|
|
@Module
|
|
public class BackendModule {
|
|
|
|
public static final String PARAM_YEAR_MONTH = "yearMonth";
|
|
|
|
@Provides
|
|
@Parameter(RequestParameters.PARAM_TLD)
|
|
static String provideTld(HttpServletRequest req) {
|
|
return assertTldExists(extractRequiredParameter(req, RequestParameters.PARAM_TLD));
|
|
}
|
|
|
|
@Provides
|
|
@Parameter(RequestParameters.PARAM_TLD)
|
|
static ImmutableSet<String> provideTlds(HttpServletRequest req) {
|
|
ImmutableSet<String> tlds = extractSetOfParameters(req, RequestParameters.PARAM_TLD);
|
|
assertTldsExist(tlds);
|
|
return tlds;
|
|
}
|
|
|
|
@Provides
|
|
@Parameter("cursorTime")
|
|
static Optional<DateTime> provideCursorTime(HttpServletRequest req) {
|
|
return extractOptionalDatetimeParameter(
|
|
req, ExpandRecurringBillingEventsAction.PARAM_CURSOR_TIME);
|
|
}
|
|
|
|
/** Extracts an optional YearMonth in yyyy-MM format from the request. */
|
|
@Provides
|
|
@Parameter(PARAM_YEAR_MONTH)
|
|
static Optional<YearMonth> provideYearMonthOptional(HttpServletRequest req) {
|
|
DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM");
|
|
Optional<String> optionalYearMonthStr = extractOptionalParameter(req, PARAM_YEAR_MONTH);
|
|
try {
|
|
return optionalYearMonthStr.map(s -> YearMonth.parse(s, formatter));
|
|
} catch (IllegalArgumentException e) {
|
|
throw new BadRequestException(
|
|
String.format(
|
|
"yearMonth must be in yyyy-MM format, got %s instead",
|
|
optionalYearMonthStr.orElse("UNSPECIFIED YEARMONTH")));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Provides the yearMonth in yyyy-MM format, if not specified in the request, defaults to one
|
|
* month prior to run time.
|
|
*/
|
|
@Provides
|
|
static YearMonth provideYearMonth(
|
|
@Parameter(PARAM_YEAR_MONTH) Optional<YearMonth> yearMonthOptional, Clock clock) {
|
|
return yearMonthOptional.orElseGet(() -> new YearMonth(clock.nowUtc().minusMonths(1)));
|
|
}
|
|
}
|