File/package naming convention conforming better to go standards - as ugly as it is

README.md

@@ -108,7 +108,7 @@ See [internal/mock](internal/mock/README.md) for its options and behaviour.
 | `internal/config` | Configuration loading, validation and editing |
 | `internal/fetcher` | Runs a worker per enabled source |
 | `internal/store` | SQLite storage of opportunities, and its migrations (see [internal/store](internal/store/README.md)) |
-| `internal/findATender` | FTS API client and conversion from OCDS to JobSearch types |
+| `internal/findatender` | FTS API client and conversion from OCDS to JobSearch types |
 | `internal/types` | JobSearch's own opportunity types |
 | `internal/util` | The periodic `Worker` used by the fetcher |
 | `internal/logging` | slog setup and the HTTP access log |
@@ -134,7 +134,7 @@ Tests don't need network access; HTTP calls go to local `httptest` servers.
 Using a source called `example` as an illustration:
 
 1. **Configuration section:** create `internal/config/conf_source_example.go`,
-   copying an existing source such as `conf_source_ftsMock.go`:
+   copying an existing source such as `conf_source_ftsmock.go`:
    - Add a `JSCKSourceExample = "example"` constant.
    - Define `JobSearchConfigSourceExample`, embedding `JobSearchConfigSource`
      (for `enabled` and `interval`), plus any fields of its own with `cfg` and
@@ -152,10 +152,10 @@ Using a source called `example` as an illustration:
    code.
 3. **Client package:** create a package that fetches from the source and
    returns `[]*types.Opportunity` (see `internal/types`). If the source
-   publishes OCDS, `internal/findATender` may already be suitable, as it is
+   publishes OCDS, `internal/findatender` may already be suitable, as it is
    for `fts_mock`: create it with the source's own API root.
 4. **Worker:** create `internal/fetcher/worker_example.go`, following
-   `worker_ftsMock.go`:
+   `worker_ftsmock.go`:
    - `runExample(ctx, conf, since)` builds a `util.Worker` with the source's
      name, `conf.Sources.Example.Interval` and a task, then calls `Run`.
    - The task fetches everything since its `since` argument. Wrap blocking

cmd/mock-fts/main.go

@@ -33,7 +33,7 @@ import (
 	_ "time/tzdata"
 
 	"git.avsdev.uk/Go/job-search/internal/logging"
-	mock "git.avsdev.uk/Go/job-search/internal/mock/findATender"
+	mock "git.avsdev.uk/Go/job-search/internal/mock/findatender"
 	"github.com/spf13/cobra"
 )
 
@@ -71,7 +71,7 @@ returned in UTC.
 
 Data: the catalog of buyers, suppliers, tender subjects, procurement methods
 and classifications that releases are generated from is embedded in the
-build from internal/mock/findATender/data/catalog.json. The mock stops with an
+build from internal/mock/findatender/data/catalog.json. The mock stops with an
 error if it is invalid.
 
 Releases are generated from that catalog and appended to

internal/cli/fetch/once.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"git.avsdev.uk/Go/job-search/internal/cli"
-	"git.avsdev.uk/Go/job-search/internal/findATender"
+	"git.avsdev.uk/Go/job-search/internal/findatender"
 	"git.avsdev.uk/Go/job-search/internal/types"
 	"github.com/spf13/cobra"
 )
@@ -70,7 +70,7 @@ func commandOnce(opts *cli.Options) *cobra.Command {
 				return sinceErr
 			}
 
-			ft := findATender.New(conf, conf.Sources.FindATender.APIRoot)
+			ft := findatender.New(conf, conf.Sources.FindATender.APIRoot)
 			defer ft.Shutdown()
 
 			ignoreRateLimit, _ := cmd.Flags().GetBool("ignore-rate-limit")

internal/fetcher/worker_findatender.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"git.avsdev.uk/Go/job-search/internal/config"
-	"git.avsdev.uk/Go/job-search/internal/findATender"
+	"git.avsdev.uk/Go/job-search/internal/findatender"
 	"git.avsdev.uk/Go/job-search/internal/types"
 	"git.avsdev.uk/Go/job-search/internal/util"
 )
@@ -35,11 +35,11 @@ func fetchFindAOpportunity(
 	ctx context.Context, conf *config.JobSearchConfig, since time.Time,
 ) error {
 	opportunities, err := util.AwaitTask(ctx, func() ([]*types.Opportunity, error) {
-		ft := findATender.New(conf, conf.Sources.FindATender.APIRoot)
+		ft := findatender.New(conf, conf.Sources.FindATender.APIRoot)
 		defer ft.Shutdown()
 		return ft.With(ctx).FetchAll(since, true)
 	})
-	if errors.Is(err, findATender.ErrNoReleases) {
+	if errors.Is(err, findatender.ErrNoReleases) {
 		return ErrNoNewReleases
 	}
 	if err != nil {

internal/fetcher/worker_ftsmock.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"git.avsdev.uk/Go/job-search/internal/config"
-	"git.avsdev.uk/Go/job-search/internal/findATender"
+	"git.avsdev.uk/Go/job-search/internal/findatender"
 	"git.avsdev.uk/Go/job-search/internal/types"
 	"git.avsdev.uk/Go/job-search/internal/util"
 )
@@ -35,11 +35,11 @@ func fetchFTSMock(
 	ctx context.Context, conf *config.JobSearchConfig, since time.Time,
 ) error {
 	opportunities, err := util.AwaitTask(ctx, func() ([]*types.Opportunity, error) {
-		ft := findATender.New(conf, conf.Sources.FTSMock.APIRoot)
+		ft := findatender.New(conf, conf.Sources.FTSMock.APIRoot)
 		defer ft.Shutdown()
 		return ft.With(ctx).FetchAll(since, true)
 	})
-	if errors.Is(err, findATender.ErrNoReleases) {
+	if errors.Is(err, findatender.ErrNoReleases) {
 		return ErrNoNewReleases
 	}
 	if err != nil {

internal/findatender/api.go

@@ -1,4 +1,4 @@
-package findATender
+package findatender
 
 import (
 	"bytes"
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"git.avsdev.uk/Go/job-search/internal/findATender/ocds"
+	"git.avsdev.uk/Go/job-search/internal/findatender/ocds"
 	"git.avsdev.uk/Go/job-search/internal/logging"
 	resty "resty.dev/v3"
 )

internal/findatender/api_test.go

@@ -1,4 +1,4 @@
-package findATender
+package findatender
 
 import (
 	"bytes"
@@ -16,7 +16,7 @@ import (
 	"time"
 
 	"git.avsdev.uk/Go/job-search/internal/config"
-	"git.avsdev.uk/Go/job-search/internal/findATender/ocds"
+	"git.avsdev.uk/Go/job-search/internal/findatender/ocds"
 	resty "resty.dev/v3"
 )
 

internal/findatender/findatender.go

@@ -1,4 +1,4 @@
-package findATender
+package findatender
 
 import (
 	"context"
@@ -54,7 +54,7 @@ func (ft *FindATender) With(ctx context.Context) *FindATender {
 // logged, as there is nothing a caller could do about it.
 func (ft *FindATender) Shutdown() {
 	if err := ft.httpClient.Close(); err != nil {
-		slog.Warn("findATender: closing HTTP client", "error", err)
+		slog.Warn("findatender: closing HTTP client", "error", err)
 	}
 }
 

internal/findatender/findatender_test.go

@@ -1,4 +1,4 @@
-package findATender
+package findatender
 
 import (
 	"context"

internal/findatender/type_convert.go

@@ -1,11 +1,11 @@
-package findATender
+package findatender
 
 import (
 	"encoding/json"
 	"slices"
 	"strings"
 
-	"git.avsdev.uk/Go/job-search/internal/findATender/ocds"
+	"git.avsdev.uk/Go/job-search/internal/findatender/ocds"
 	"git.avsdev.uk/Go/job-search/internal/types"
 )
 

internal/findatender/type_convert_test.go

@@ -1,4 +1,4 @@
-package findATender
+package findatender
 
 import (
 	"encoding/json"
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"git.avsdev.uk/Go/job-search/internal/findATender/ocds"
+	"git.avsdev.uk/Go/job-search/internal/findatender/ocds"
 	"git.avsdev.uk/Go/job-search/internal/types"
 )
 

internal/mock/README.md

@@ -5,10 +5,10 @@ development and testing without hitting the real APIs or their rate limits.
 
 | Package | Mocks | Command |
 |---|---|---|
-| `findATender` | UK Government Find a Tender service (FTS) OCDS API | `cmd/mock-fts` |
+| `findatender` | UK Government Find a Tender service (FTS) OCDS API | `cmd/mock-fts` |
 
 
-## findATender
+## findatender
 A mock of the FTS release package endpoint:
 
 ```
@@ -81,7 +81,7 @@ Query parameters, as on the real service:
 
 
 ### Generated data
-- **Catalog** (`findATender/data/catalog.json`): the buyers, suppliers,
+- **Catalog** (`findatender/data/catalog.json`): the buyers, suppliers,
   tender subjects, procurement methods and classifications that releases are
   drawn from. It's embedded in the binary, so rebuild after changing it.
   Subjects refer to classifications by `{scheme}-{id}` keys (e.g.
@@ -111,5 +111,5 @@ Query parameters, as on the real service:
 | `ocds/` | Generated OCDS types (`ocds_gen.go`, from `ocdsgen`); don't edit by hand |
 | `testdata/` | A small catalog used by the tests |
 
-The mock's `ocds` package is separate from `internal/findATender/ocds`, which
+The mock's `ocds` package is separate from `internal/findatender/ocds`, which
 the JobSearch client uses.

internal/mock/findatender/catalog.go

@@ -9,7 +9,7 @@ import (
 	"sort"
 	"strings"
 
-	"git.avsdev.uk/Go/job-search/internal/mock/findATender/ocds"
+	"git.avsdev.uk/Go/job-search/internal/mock/findatender/ocds"
 )
 
 // Method is a procurement method and its details, as published on a tender.

internal/mock/findatender/generator.go

@@ -9,7 +9,7 @@ import (
 	"math/rand"
 	"time"
 
-	"git.avsdev.uk/Go/job-search/internal/mock/findATender/ocds"
+	"git.avsdev.uk/Go/job-search/internal/mock/findatender/ocds"
 )
 
 const ocidPrefix = "ocds-mock-"

internal/mock/findatender/generator_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"git.avsdev.uk/Go/job-search/internal/mock/findATender/ocds"
+	"git.avsdev.uk/Go/job-search/internal/mock/findatender/ocds"
 )
 
 func quietLog(t *testing.T) {

internal/mock/findatender/handler.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"git.avsdev.uk/Go/job-search/internal/mock/findATender/ocds"
+	"git.avsdev.uk/Go/job-search/internal/mock/findatender/ocds"
 )
 
 const (

internal/mock/findatender/handler_test.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"git.avsdev.uk/Go/job-search/internal/mock/findATender/ocds"
+	"git.avsdev.uk/Go/job-search/internal/mock/findatender/ocds"
 )
 
 func TestUpdatedFromIsLocalTime(t *testing.T) {

internal/mock/findatender/store.go

@@ -16,7 +16,7 @@ import (
 	"sync"
 	"time"
 
-	"git.avsdev.uk/Go/job-search/internal/mock/findATender/ocds"
+	"git.avsdev.uk/Go/job-search/internal/mock/findatender/ocds"
 )
 
 // Store keeps every release in memory and appends each new one to a JSON Lines

internal/mock/findatender/store_test.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"git.avsdev.uk/Go/job-search/internal/mock/findATender/ocds"
+	"git.avsdev.uk/Go/job-search/internal/mock/findatender/ocds"
 )
 
 func TestStorePersistsAndGeneratorProgresses(t *testing.T) {