From a5741d58317eb5d5b2b4a61ca901b66e2f6a0b0d Mon Sep 17 00:00:00 2001 From: mr Date: Mon, 22 Jul 2024 10:57:00 +0200 Subject: [PATCH] omitempty is not null --- entrypoint.go | 15 ++++++++++----- .../Cache/Cache_Data/15651df7a7ad0fa5_0 | Bin 8654 -> 8654 bytes .../Cache/Cache_Data/index-dir/the-real-index | Bin 168 -> 168 bytes ~/.vscode-root/TransportSecurity | 2 +- ~/.vscode-root/User/globalStorage/state.vscdb | Bin 151552 -> 151552 bytes .../state.vscdb | Bin 28672 -> 32768 bytes .../logs/20240722T100355/network.log | 1 + .../2-gopls (server).log | 8 ++++++++ .../window1/exthost/vscode.git/Git.log | 8 ++++++++ 9 files changed, 28 insertions(+), 6 deletions(-) diff --git a/entrypoint.go b/entrypoint.go index 4b6e214..b520e4a 100644 --- a/entrypoint.go +++ b/entrypoint.go @@ -42,27 +42,32 @@ func GetLogger() zerolog.Logger { func LoadOne(collection LibDataEnum, id string) LibData { d, code, err := models.Model(collection.EnumIndex()).GetAccessor().LoadOne(id) - return LibData{Data: d, Code: code, Err: err.Error()} + if err != nil { return LibData{Data: d, Code: code, Err: err.Error()} } + return LibData{Data: d, Code: code } } func UpdateOne(collection LibDataEnum, set map[string]interface{}, id string) LibData { d, code, err := models.Model(collection.EnumIndex()).GetAccessor().UpdateOne(set, id) - return LibData{Data: d, Code: code, Err: err.Error()} + if err != nil { return LibData{Data: d, Code: code, Err: err.Error()} } + return LibData{Data: d, Code: code } } func DeleteOne(collection LibDataEnum, id string) LibData { d, code, err := models.Model(collection.EnumIndex()).GetAccessor().DeleteOne(id) - return LibData{Data: d, Code: code, Err: err.Error()} + if err != nil { return LibData{Data: d, Code: code, Err: err.Error()} } + return LibData{Data: d, Code: code } } func StoreOne(collection LibDataEnum, object map[string]interface{}) LibData { model := models.Model(collection.EnumIndex()) d, code, err := model.GetAccessor().StoreOne(model.Deserialize(object)) - return LibData{Data: d, Code: code, Err: err.Error()} + if err != nil { return LibData{Data: d, Code: code, Err: err.Error()} } + return LibData{Data: d, Code: code } } func CopyOne(collection LibDataEnum, object map[string]interface{}) LibData { model := models.Model(collection.EnumIndex()) d, code, err := model.GetAccessor().CopyOne(model.Deserialize(object)) - return LibData{Data: d, Code: code, Err: err.Error()} + if err != nil { return LibData{Data: d, Code: code, Err: err.Error()} } + return LibData{Data: d, Code: code } } diff --git a/~/.vscode-root/Cache/Cache_Data/15651df7a7ad0fa5_0 b/~/.vscode-root/Cache/Cache_Data/15651df7a7ad0fa5_0 index 6fc0473fe4af5c5481658def611556a972d6bf29..b6c23826558a3539271801216c1269e26681ddc2 100644 GIT binary patch delta 202 zcmX@-e9n0TADf_m!A$3j8hr-GT@c!NvOHU(qmiKrLvmtrMyhUdeqKpYevVacVufyE zdaA9lnSlXAN@7W>m2ZBYj)IYqf>&vdf{}rdiGqQJm9eFjp}B&)Z^&djc3D<1Z*l^= zE0d}DfR!Y38Pesk$i!K*GSlJW ze#j=v3RX6mncbDi&|tC`d#;>$YD!X~iGhi3ih*IOu7QDpg|1nefu(LrvT>TB+2pJ2 Y>XRclcsHkU#7Oe2F}$5KL7D*!09OVymjD0& diff --git a/~/.vscode-root/Cache/Cache_Data/index-dir/the-real-index b/~/.vscode-root/Cache/Cache_Data/index-dir/the-real-index index 6849c76dfd37d9905c0767ae534dcdbd77a2e769..2ff570f2d304417c869d2923850e8050a00c82d4 100644 GIT binary patch delta 48 zcmZ3%xPp;m0Rsbren9(!i5wa-4TtP1Givl17?gp6Kw#-!({poL%}S8?M4uP{QhpCR delta 48 zcmZ3%xPp;m0RscWBO|@~i5wa-4uQwzGivl17?gp6Kw#-!({poL&B}(!*W@Sq!~g(4 C^A4i` diff --git a/~/.vscode-root/TransportSecurity b/~/.vscode-root/TransportSecurity index 4ee4d86..05c051a 100644 --- a/~/.vscode-root/TransportSecurity +++ b/~/.vscode-root/TransportSecurity @@ -1 +1 @@ -{"sts":[{"expiry":1753172543.797721,"host":"KRwoeRoAGB723I8uE7JpeWqerzN/Pxk/AmwjzlZKhxE=","mode":"force-https","sts_include_subdomains":false,"sts_observed":1721636543.797727},{"expiry":1753171621.715392,"host":"bvX4PpTCW5oYCQv3FySIixdkmM+paN/l+o4e/8K1m3o=","mode":"force-https","sts_include_subdomains":true,"sts_observed":1721635621.715397},{"expiry":1724227619.042417,"host":"4cSRm3ZaWx4KVCd+M3ed0gO9bp0ajI76eY5o5OomVHI=","mode":"force-https","sts_include_subdomains":false,"sts_observed":1721635619.042422}],"version":2} \ No newline at end of file +{"sts":[{"expiry":1753174453.301236,"host":"KRwoeRoAGB723I8uE7JpeWqerzN/Pxk/AmwjzlZKhxE=","mode":"force-https","sts_include_subdomains":false,"sts_observed":1721638453.301241},{"expiry":1753171621.715392,"host":"bvX4PpTCW5oYCQv3FySIixdkmM+paN/l+o4e/8K1m3o=","mode":"force-https","sts_include_subdomains":true,"sts_observed":1721635621.715397},{"expiry":1724227619.042417,"host":"4cSRm3ZaWx4KVCd+M3ed0gO9bp0ajI76eY5o5OomVHI=","mode":"force-https","sts_include_subdomains":false,"sts_observed":1721635619.042422}],"version":2} \ No newline at end of file diff --git a/~/.vscode-root/User/globalStorage/state.vscdb b/~/.vscode-root/User/globalStorage/state.vscdb index 4d824700c1dd1a3daafe6059d330c4653249e292..241e8890279d62131d8f4f12bb9a7068764bcf96 100644 GIT binary patch delta 605 zcmZozz}c{XbAmLZ-$WT_M!$^-t@4cQlb^{uFtKY-)=)@b;`p(-OM#D#^?(L*Fw=BL zX(r{#2h<|e#7a_&ax?Q1bM!JYi%as0D)mbEnB|$$^K%mO()H5w8Fqlx8%Q!KvoRb} zX7*;BZXm@ZKe6b)LI!h%ZiipQzV&9nacBvvXfHtk~8!Q z67y1X^old9QW*}*GTSpwo*gMUSzj}Zh4UkWS%WE+iFdPBKnF7mmnakCbbDzg%gyhD)!0}V7#L)lC8M@W zMlrtFD$aJFfrHtHfh&efo1>dYm*pL^5BEH7tL+j3Ovl++IJFtqY_1BJ%(%Twf~ilO znTaiKI=car5zr7e)#8KD8JaiSH#%$w8pzMa(IVVv z!6M%wxw$r=pRry?DLua+r#QH@s4TV8IX^EgGhN9_sX9ifpeR4Lpd?1gs-&niRR_io z0mg}MeqKoiP$Dfcrx+xYl30@J3{+fNlA00#)`hGpM#;#)$VAt`T-V4b#K6MJ*u=`n xM9<9FJSs-1R>`~;=ppuC^%AK@XJ%7jY>{MQZqDDx&8#R0j>=TM^vsg#S^%weu8;r# delta 364 zcmZozz}c{XbAmLZ!$cWpMu&|Ft@4Zplb^{uFmb3%)=)@b;%wdArNGC=xER+eOJ$%52&!8MR$9it)u(agH(uPG%nlw)hC zZI=*WI?l$@ERx2uxhh~X;_CmEY0?f2GeZ~m`-ia^I&pi-R@(? zw3U;efq{XM{}coNDL!@}Q)Oe}cV2|b=|GiVS&bVFnS-b6OEPJ(o0(af8k-sd0Lsf= AYybcN diff --git a/~/.vscode-root/User/workspaceStorage/6bacb54e73e2fbaeb82c32f04196587d/state.vscdb b/~/.vscode-root/User/workspaceStorage/6bacb54e73e2fbaeb82c32f04196587d/state.vscdb index fceea1e17e97baf96b82c214b409ace9504f186c..ee1ad1f615ebce02b8e103538b30a6336582b814 100644 GIT binary patch delta 225 zcmZp8z}V2hG(nnGl!1YPW1@mRqv*zjCHw*`{BM8)3>^Hw`M>dh2}l$%+URdF(Vf+iEI z;>N=FENmY3EV7NPli$jjO@1%J!DeV`Vp3bXIXiVK7Z)$k97Zlt1}@Q!h1^`s-5Cy> V*M-!uGMgD1P1cPv1Jh|y1^}ouJb(ZI delta 177 zcmV;i08amafC7Nv0gxL76951J2azB@0TZ!cqz@1S5Ags1000LM`w#XH@eTB|6cE@C z1x{smQ*^WO9}^7)CL#k#0h1j>9 git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track)%00%(upstream:remotename)%00%(upstream:remoteref) refs/heads/main refs/remotes/main [1ms] 2024-07-22 10:23:37.027 [info] > git config --local branch.main.vscode-merge-base [3ms] 2024-07-22 10:23:37.033 [info] > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track)%00%(upstream:remotename)%00%(upstream:remoteref) refs/heads/origin/main refs/remotes/origin/main [1ms] +2024-07-22 10:52:17.030 [info] > git config --get commit.template [5ms] +2024-07-22 10:52:17.032 [info] > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track)%00%(upstream:remotename)%00%(upstream:remoteref) refs/heads/main refs/remotes/main [1ms] +2024-07-22 10:52:17.035 [warning] ENOENT: no such file or directory, open '/home/mr/Documents/OC/oc-workflow/.git/refs/remotes/origin/main' +2024-07-22 10:52:17.037 [info] > git rev-parse refs/remotes/origin/main [2ms] +2024-07-22 10:52:17.042 [info] > git status -z -uall [2ms] +2024-07-22 10:52:17.048 [info] > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track)%00%(upstream:remotename)%00%(upstream:remoteref) refs/heads/main refs/remotes/main [2ms] +2024-07-22 10:52:17.053 [info] > git config --local branch.main.vscode-merge-base [1ms] +2024-07-22 10:52:17.059 [info] > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track)%00%(upstream:remotename)%00%(upstream:remoteref) refs/heads/origin/main refs/remotes/origin/main [2ms]