Dev (#347)

* update

* cleanup

* update

* update orval

* update

* auth update

* fix gowrap version - no option for alias

* update pregen

Author: danicc097

bin/project

@@ -293,7 +293,7 @@ x.install-tools() {
       "go install github.com/air-verse/air@latest"
       "go install github.com/danicc097/xo/v5@v5.6.0"
       "go install github.com/mikefarah/yq/v4@v4.34.2"
-      "go install github.com/hexdigest/gowrap/cmd/gowrap@latest"
+      "go install github.com/hexdigest/gowrap/cmd/gowrap@v1.4.0"
       "go install golang.org/x/tools/cmd/stringer@latest"
       "go install github.com/maxbrunsfeld/counterfeiter/v6@latest"
       "go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1"
@@ -372,19 +372,19 @@ x.gen.pregen() {
       echo "${YELLOW}Generating missing rest package \$ref's:"
       printf "${YELLOW}  - %s\n" "${missing_rest_models[@]}"
       echo "${OFF}"
-    fi
 
-    local new_schemas=""
-    for ref in "${missing_rest_models[@]}"; do
-      new_schemas+="\"$ref\": {
+      local new_schemas=""
+      for ref in "${missing_rest_models[@]}"; do
+        new_schemas+="\"$ref\": {
             \"x-gen-struct\": \"$ref\",
             \"x-is-generated\": true
           },"
-    done
+      done
 
-    yq eval-all ".components.schemas += {
-      ${new_schemas%,}
-    }" -i "$SPEC_PATH"
+      yq eval-all ".components.schemas += {
+        ${new_schemas%,}
+      }" -i "$SPEC_PATH"
+    fi
 
     codegen validate-spec -env=".env.$X_ENV"
     # useless after merging models and db
@@ -419,12 +419,9 @@ x.gen.pregen() {
 
     update_roles_and_scopes
 
-    codegen pre -env=".env.$X_ENV" -op-id-auth="$OPID_AUTH_PATH" &
-    validate_spec &
-    update_spec_with_structs &
-
-    wait_without_error
-
+    validate_spec
+    codegen pre -env=".env.$X_ENV" -op-id-auth="$OPID_AUTH_PATH" # should not edit spec
+    update_spec_with_structs
     remove_schemas_marked_for_deletion
   } 2>&4 | xlog >&3; } 4>&1 | xerr >&3; } 3>&1
   xsetup.backup.cleanup
@@ -590,7 +587,6 @@ generate_repo_constructor() {
   go-utils.find_interfaces repo_interfaces $repos
 
   for iface in "${repo_interfaces[@]}"; do
-    local struct_init+=("${iface}: ${iface,}")
     local struct_fields+=("${iface} ${iface}")
   done
 

db/post-migrations/001_public_triggers.up.sql renamed to db/post-migrations/001_public_triggers_and_functions.up.sql

@@ -41,3 +41,32 @@ begin
 end;
 $BODY$
 language plpgsql;
+
+--
+--
+--
+--
+--
+--
+--
+-- FUNCTIONS
+--
+--
+--
+--
+--
+--
+--
+--
+create or replace function row_estimator (query text)
+  returns bigint
+  language plpgsql
+  as $$
+declare
+  plan jsonb;
+begin
+  execute 'EXPLAIN (FORMAT JSON) ' || query into plan;
+
+  return (plan -> 0 -> 'Plan' ->> 'Plan Rows')::bigint;
+end;
+$$;

frontend/package.json

@@ -79,7 +79,7 @@
     "moment": "^2.29.4",
     "msw": "^2.2.1",
     "openapi-typescript": "^6.4.3",
-    "orval": "^6.25.0",
+    "orval": "6.30.2",
     "postcss": "^8.4.24",
     "postcss-preset-mantine": "1.9.0",
     "postcss-simple-vars": "^7.0.1",

frontend/pnpm-lock.yaml

@@ -1,6 +1,6 @@
 import type * as EntityIDs from 'src/gen/entity-ids'
 /**
- * Generated by orval v6.25.0 🍺
+ * Generated by orval v6.30.2 🍺
  * Do not edit manually.
  * OpenAPI openapi-go-gin-postgres-sqlc
  * openapi-go-gin-postgres-sqlc
@@ -18,19 +18,20 @@ import type {
   ActivityResponse
 } from '.././model'
 
-export const getCreateActivityResponseMock = (overrideResponse: any = {}): ActivityResponse => ({activityID: faker.number.int({min: undefined, max: undefined}) as EntityIDs.ActivityID, deletedAt: faker.helpers.arrayElement([(() => faker.date.past())(), null]), description: faker.word.sample(), isProductive: faker.datatype.boolean(), name: faker.word.sample(), projectID: faker.number.int({min: undefined, max: undefined}) as EntityIDs.ProjectID, ...overrideResponse})
+export const getCreateActivityResponseMock = (overrideResponse: Partial< ActivityResponse > = {}): ActivityResponse => ({activityID: faker.number.int({min: undefined, max: undefined}) as EntityIDs.ActivityID, deletedAt: faker.helpers.arrayElement([(() => faker.date.past())(), null]), description: faker.word.sample(), isProductive: faker.datatype.boolean(), name: faker.word.sample(), projectID: faker.number.int({min: undefined, max: undefined}) as EntityIDs.ProjectID, ...overrideResponse})
 
-export const getGetActivityResponseMock = (overrideResponse: any = {}): ActivityResponse => ({activityID: faker.number.int({min: undefined, max: undefined}) as EntityIDs.ActivityID, deletedAt: faker.helpers.arrayElement([(() => faker.date.past())(), null]), description: faker.word.sample(), isProductive: faker.datatype.boolean(), name: faker.word.sample(), projectID: faker.number.int({min: undefined, max: undefined}) as EntityIDs.ProjectID, ...overrideResponse})
+export const getGetActivityResponseMock = (overrideResponse: Partial< ActivityResponse > = {}): ActivityResponse => ({activityID: faker.number.int({min: undefined, max: undefined}) as EntityIDs.ActivityID, deletedAt: faker.helpers.arrayElement([(() => faker.date.past())(), null]), description: faker.word.sample(), isProductive: faker.datatype.boolean(), name: faker.word.sample(), projectID: faker.number.int({min: undefined, max: undefined}) as EntityIDs.ProjectID, ...overrideResponse})
 
-export const getUpdateActivityResponseMock = (overrideResponse: any = {}): ActivityResponse => ({activityID: faker.number.int({min: undefined, max: undefined}) as EntityIDs.ActivityID, deletedAt: faker.helpers.arrayElement([(() => faker.date.past())(), null]), description: faker.word.sample(), isProductive: faker.datatype.boolean(), name: faker.word.sample(), projectID: faker.number.int({min: undefined, max: undefined}) as EntityIDs.ProjectID, ...overrideResponse})
+export const getUpdateActivityResponseMock = (overrideResponse: Partial< ActivityResponse > = {}): ActivityResponse => ({activityID: faker.number.int({min: undefined, max: undefined}) as EntityIDs.ActivityID, deletedAt: faker.helpers.arrayElement([(() => faker.date.past())(), null]), description: faker.word.sample(), isProductive: faker.datatype.boolean(), name: faker.word.sample(), projectID: faker.number.int({min: undefined, max: undefined}) as EntityIDs.ProjectID, ...overrideResponse})
 
 
-export const getCreateActivityMockHandler = (overrideResponse?: ActivityResponse) => {
-  return http.post('*/project/:projectName/activity/', async () => {
-    await delay(200);
-    return new HttpResponse(JSON.stringify(overrideResponse ? overrideResponse : getCreateActivityResponseMock()),
+export const getCreateActivityMockHandler = (overrideResponse?: ActivityResponse | ((info: Parameters<Parameters<typeof http.post>[1]>[0]) => Promise<ActivityResponse> | ActivityResponse)) => {
+  return http.post('*/project/:projectName/activity/', async (info) => {await delay(200);
+    return new HttpResponse(JSON.stringify(overrideResponse !== undefined 
+            ? (typeof overrideResponse === "function" ? await overrideResponse(info) : overrideResponse) 
+            : getCreateActivityResponseMock()),
       {
-        status: 200,
+        status: 201,
         headers: {
           'Content-Type': 'application/json',
         }
@@ -39,10 +40,11 @@ export const getCreateActivityMockHandler = (overrideResponse?: ActivityResponse
   })
 }
 
-export const getGetActivityMockHandler = (overrideResponse?: ActivityResponse) => {
-  return http.get('*/activity/:activityID', async () => {
-    await delay(200);
-    return new HttpResponse(JSON.stringify(overrideResponse ? overrideResponse : getGetActivityResponseMock()),
+export const getGetActivityMockHandler = (overrideResponse?: ActivityResponse | ((info: Parameters<Parameters<typeof http.get>[1]>[0]) => Promise<ActivityResponse> | ActivityResponse)) => {
+  return http.get('*/activity/:activityID', async (info) => {await delay(200);
+    return new HttpResponse(JSON.stringify(overrideResponse !== undefined 
+            ? (typeof overrideResponse === "function" ? await overrideResponse(info) : overrideResponse) 
+            : getGetActivityResponseMock()),
       {
         status: 200,
         headers: {
@@ -53,10 +55,11 @@ export const getGetActivityMockHandler = (overrideResponse?: ActivityResponse) =
   })
 }
 
-export const getUpdateActivityMockHandler = (overrideResponse?: ActivityResponse) => {
-  return http.patch('*/activity/:activityID', async () => {
-    await delay(200);
-    return new HttpResponse(JSON.stringify(overrideResponse ? overrideResponse : getUpdateActivityResponseMock()),
+export const getUpdateActivityMockHandler = (overrideResponse?: ActivityResponse | ((info: Parameters<Parameters<typeof http.patch>[1]>[0]) => Promise<ActivityResponse> | ActivityResponse)) => {
+  return http.patch('*/activity/:activityID', async (info) => {await delay(200);
+    return new HttpResponse(JSON.stringify(overrideResponse !== undefined 
+            ? (typeof overrideResponse === "function" ? await overrideResponse(info) : overrideResponse) 
+            : getUpdateActivityResponseMock()),
       {
         status: 200,
         headers: {
@@ -68,11 +71,10 @@ export const getUpdateActivityMockHandler = (overrideResponse?: ActivityResponse
 }
 
 export const getDeleteActivityMockHandler = () => {
-  return http.delete('*/activity/:activityID', async () => {
-    await delay(200);
+  return http.delete('*/activity/:activityID', async () => {await delay(200);
     return new HttpResponse(null,
       {
-        status: 200,
+        status: 204,
         headers: {
           'Content-Type': 'application/json',
         }