Skip to content
This repository was archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
change column names and set team sigma fk-nada table
Browse files Browse the repository at this point in the history
  • Loading branch information
MengZhuNAV committed Nov 24, 2023
1 parent ea6978d commit 80d96a8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ local-with-auth:
--quarto-bucket=nada-quarto-storage-dev \
--console-api-key="$(CONSOLE_API_KEY)" \
--log-level=debug \
--central-data-project=nav-central-data-dev-e170
--central-data-project=nav-central-data-dev-e170 \
--fk-nada-table=nav-central-data-dev-e170.fk_nada_test.fk_nada


local:
Expand Down
2 changes: 1 addition & 1 deletion cmd/nada-backend/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func init() {
flag.StringVar(&cfg.AmplitudeAPIKey, "amplitude-api-key", os.Getenv("AMPLITUDE_API_KEY"), "API key for Amplitude")
flag.StringVar(&cfg.CentralDataProject, "central-data-project", os.Getenv("CENTRAL_DATA_PROJECT"), "bigquery project for pseudo views")
flag.StringVar(&cfg.PseudoDataset, "pseudo-dataset", "markedsplassen_pseudo", "bigquery dataset in producers' project for markedplassen saving pseudo views")
flag.StringVar(&cfg.FkNadaTable, "fk-nada-table", "nav-central-data-dev-e170.fk_nada_test.fk_nada", "table for mapping fnr column in datasets to fk-nada")
flag.StringVar(&cfg.FkNadaTable, "fk-nada-table", "team-sigma-prod-a20a.fk_person_nada.off_id_til_fk_person_nada", "table for mapping fnr column in datasets to fk-nada")
}

func main() {
Expand Down
6 changes: 3 additions & 3 deletions pkg/bigquery/bigquery.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ type Bigquery struct {
fkNadaTable string
}

const fnr = "fnr"
const fkNada = "fk_nada"
const fnr = "off_id"
const fkNada = "fk_person_nada"

func New(ctx context.Context, centralDataProject, pseudoDataset string, fkNadaTable string) (*Bigquery, error) {
return &Bigquery{
Expand Down Expand Up @@ -230,7 +230,7 @@ func (c *Bigquery) ComposeJoinableViewQuery(plainTableUrl models.BigQuery, joina

if fnrColumnMapToFkNada != "" {
qViewJoinSalt = fmt.Sprintf(",vjs AS (SELECT v.*, unified_salt.salt AS __salt, n.%v AS %v FROM `%v` v INNER JOIN `%v` n ON v.%v=n.%v CROSS JOIN unified_salt)",
fkNada, fkNada, viewID, c.fkNadaTable, fnr, fnr)
fkNada, fkNada, viewID, c.fkNadaTable, fnrColumnMapToFkNada, fnr)
hashColumns = append(hashColumns, fkNada)
} else {
qViewJoinSalt = fmt.Sprintf(",vjs AS (SELECT v.*, unified_salt.salt AS __salt FROM `%v` v CROSS JOIN unified_salt)",
Expand Down

0 comments on commit 80d96a8

Please sign in to comment.