From 7b314f9435433d0f297a5716986dcb23921182e8 Mon Sep 17 00:00:00 2001 From: Jason Rasmussen Date: Mon, 22 Jan 2024 11:49:51 -0500 Subject: [PATCH] chore(server): sort open api params (#6484) * chore: sort spec * chore: open api * chore(mobile): sort auditDeletes params --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> --- mobile/lib/shared/services/asset.service.dart | 2 +- mobile/openapi/doc/ActivityApi.md | Bin 9021 -> 9021 bytes mobile/openapi/doc/AlbumApi.md | Bin 21403 -> 21403 bytes mobile/openapi/doc/AssetApi.md | Bin 71548 -> 71548 bytes mobile/openapi/doc/AuditApi.md | Bin 8494 -> 8494 bytes mobile/openapi/doc/SearchApi.md | Bin 6700 -> 6700 bytes mobile/openapi/doc/SharedLinkApi.md | Bin 17431 -> 17431 bytes mobile/openapi/lib/api/activity_api.dart | Bin 7587 -> 7587 bytes mobile/openapi/lib/api/album_api.dart | Bin 17181 -> 17181 bytes mobile/openapi/lib/api/asset_api.dart | Bin 68906 -> 68906 bytes mobile/openapi/lib/api/audit_api.dart | Bin 6821 -> 6821 bytes mobile/openapi/lib/api/search_api.dart | Bin 6561 -> 6561 bytes mobile/openapi/lib/api/shared_link_api.dart | Bin 14251 -> 14251 bytes mobile/openapi/test/activity_api_test.dart | Bin 1127 -> 1127 bytes mobile/openapi/test/album_api_test.dart | Bin 1941 -> 1941 bytes mobile/openapi/test/asset_api_test.dart | Bin 6743 -> 6743 bytes mobile/openapi/test/audit_api_test.dart | Bin 1053 -> 1053 bytes mobile/openapi/test/search_api_test.dart | Bin 944 -> 944 bytes mobile/openapi/test/shared_link_api_test.dart | Bin 1758 -> 1758 bytes open-api/immich-openapi-specs.json | 1172 ++++++++-------- open-api/typescript-sdk/client/api.ts | 1206 ++++++++--------- server/src/immich/app.utils.ts | 21 +- 22 files changed, 1210 insertions(+), 1191 deletions(-) diff --git a/mobile/lib/shared/services/asset.service.dart b/mobile/lib/shared/services/asset.service.dart index 2ffeb53fa..737d4d56a 100644 --- a/mobile/lib/shared/services/asset.service.dart +++ b/mobile/lib/shared/services/asset.service.dart @@ -53,7 +53,7 @@ class AssetService { Future<(List? toUpsert, List? toDelete)> _getRemoteAssetChanges(User user, DateTime since) async { final deleted = await _apiService.auditApi - .getAuditDeletes(EntityType.ASSET, since, userId: user.id); + .getAuditDeletes(since, EntityType.ASSET, userId: user.id); if (deleted == null || deleted.needsFullSync) return (null, null); final assetDto = await _apiService.assetApi .getAllAssets(userId: user.id, updatedAfter: since); diff --git a/mobile/openapi/doc/ActivityApi.md b/mobile/openapi/doc/ActivityApi.md index 6221ef5e4f01e12ca93cf7886cdd806a6c0225d5..1552e308636a770cf9500de74899a262a20973b2 100644 GIT binary patch delta 75 zcmdn%w%2XL20`we)UwnZ9fgw0g4E5s1-GzFo+zd=IbTd^@>a2CK_p2Xh0@~GqRH9{ X@sn4GU!1&F!fbM-gvsW|5>Z?LU%edj delta 75 zcmdn%w%2XL20`wU%7RoKg`Cu~)SS(`1-GzFo-C#`IbTd=@>a2CK_p2Xh0@~GqRH9{ X@sn4GU!1&N!enx#gxTiD5>Z?LU_Bi7 diff --git a/mobile/openapi/doc/AlbumApi.md b/mobile/openapi/doc/AlbumApi.md index fab77bc03a913fc292c6b71cefa3a98f96a5b8f3..427181880dc02151d8fff757b614fb02c8a765f5 100644 GIT binary patch delta 177 zcmbQeoN@MY#tmzXZ2`SmlyRb3OCY@-;G3bQCc4P2QmYdvZRP^5hi;dYk_k{9)uv1exavR9u{qSd_Xs xQAUMjvX}Y1$tvawP&0Y?QPreO(g>a0V9_(#*s^0Xr=|MjKL(&d-Rr#Ig*lwss6&PXgu1*%U38Sc3` zQAUMj@;P&<$tvbcpyu-OqpC@nq!Bu~!J>x^B0Tw?f!t(H%kIg43`93yuskgZ0QFl% Ak^lez diff --git a/mobile/openapi/doc/AssetApi.md b/mobile/openapi/doc/AssetApi.md index fb2ad2411c02340d91a10ec518c615b9185eb2f6..02844881485b70c1e80106e667983e2a2085e90e 100644 GIT binary patch delta 1432 zcmds1S!fec6lE~cLalWxwXMsjFG_N^`_fZ&8wu7Y#F*kknMG>B)il| z%4?Ka&O!K85k(JmIM!>#m4|y~3aLVgk4C0>A&h;Mc+_h}nop15$ht&<==80b59YM5 zl)|$|MYuCo>}^>|8Nk>!;o=cJ#JeSG!wT`dzZh%p70xv71qJzj`Fs$Qtxm9sZ;&&;pO^@0#^a;_}p}AtysS1)Ic5U5SZkONyZ_weOaA z{D|swB70a>h(tWXQIg7$uo&7StI#O{xiA{dLLj;XZ=#uLUE-{wa#wT^o0z(l7_&;^ zBr+Di&rMHwf5%LxK`dJX_pkv?;Q~Aem*8~3jH-ae%PyggASZ0W*Ka1}#&8}5Lu8A$ zb17AYK)3;;L+i0S)QRTE8VrVvI2y^uv2a;;Xm@u=i&w!NI2AObGHAi`p$*Wec0$OX zLS+~nDa3++b!Kk!@idb0pEp|lC+hHa^eW^r16IWIVT%{x-Na^fEyBGC19HX=A~v-Z zEwN3?ov}s=p*Z7B%c2-ui0?x@wiWs*8y0=k;p|i~3?J8{JZ`}E$x^(U+zhX}$mAA0 cju}C$90sQh_%dFG+KIY<^r}!w&L^(qH-I@_I{*Lx delta 1486 zcmd^9UrbY17|%^Qs6!A9s6dt$VYIddD~RGGZEuHU#^9(<6Jtnvxjooxp>6KHWuOn! zXrgRJ(ch9z4Te7wP2AeDn`|1h>60%$s9UVsf>3E2O?c2mU1o@SS|mO$V~=|{Ip6o4 z?|i@fzJIeJ)oe%=d9%?Vc?7>nD{~%V(gq|VZgH8kg4E1)`$R#eHbG)V-Ys+!7p~vc z`op3bYuV zLc7R`y_tH+y?)xmKG8))^xr8{^KQa>q(B$0-)UQ(DOwZhB=UR(v*pC|yQRx`k#N*( zCmlYK2B0biY-K9Hi<7ZDg diff --git a/mobile/openapi/doc/AuditApi.md b/mobile/openapi/doc/AuditApi.md index 8fbca70bc704951dc3d8499927ccfde01cbc7ddb..8514cdec7376841e8525ae099fb31043b4368805 100644 GIT binary patch delta 77 zcmZ4Iw9aY64^F|vw35^!9fj1qlFX9IkjjG8&754?ER&=7EGC=qsZE~5SB$A-vKarH S$@&8FlbHl`H~R@Z5C8y8tQ#Ky delta 77 zcmZ4Iw9aY64^F|?f;G;II? delta 145 zcmZ2uvc_b?D-M-H9fiWu)S^lqh2)&f0v&~t%7RoKg`(8t)VvZMh1~p-%>2B~e4Ius zlk0eWCOh!TO@76zG5Hj)!sIw07UJ_G%7n=+e6JV_CmRYVPrk>mF*%Q4b+WF2`eZgB Np3JYlIYi(FCje4@F(v>2 diff --git a/mobile/openapi/doc/SharedLinkApi.md b/mobile/openapi/doc/SharedLinkApi.md index 873ffc5825e85099ba4094f8147a426258440c3e..ff62cf423e47585100629d59eb86619c8d07b9fc 100644 GIT binary patch delta 125 zcmbQTLbRNdV(@4>8T~YmBAT_MX4!1nR(e7*i4w5Cm1?eM{&wzVI}3sdliEx_i~9& N-XnB%vx4$>1pw*1EWZE% delta 128 zcmbQB(t1?c0$DcfT9)HBPHI_dj+FwK(gB-q M1tvGg3cGOu08;8UQvd(} delta 123 zcmZ2%z1VsK5AS3>A?e91ysDEQh;d8~;Z2x)ikD~ddLgmNH-+RU|Ko6+{F2Ff^L=qu z#>pS~6DH5&kKP<8u!9jzm*C_ip-?29IT9t61*ujFAW}ymC$%g!#|lDijum#}0swyw BD-Hkv diff --git a/mobile/openapi/lib/api/album_api.dart b/mobile/openapi/lib/api/album_api.dart index 122a83940d234a9b178ecc00d17dc260b553e99f..bca2a985c590599988672c00627d4a64b2d7e184 100644 GIT binary patch delta 318 zcmbQ+#yGc)al)R3f|J)Var0Fx1eX+L=B3*! zWT#f@OqN#^+w7!h&Nx|%#dmU{Qt@U>Wm85J1DG77Cht~};z8FoIf+eevaG5cC(s-# zh+$T$@|%-Y?=b=Ob4*UtC~>uCtySZo5o~5T`2{q1y(SI4%7}SD7`sR Z^#SALc^p-fm+1&j*5Z`fd{#d|7y!+yYj*$u delta 315 zcmbQ+#yGc)alSo3VQGLlv>fmzd%w&$o@7yiT)c z@;RmK$x190lOI@GO!m>y6iALAt+ZsBuN%{FX_6o%riAAX? zItsxhMVWc&_6mt0V?0wPJ1F{3?hv#FyK1&p*kmKE#Lbq<{EToTX6fh?Fd~6XV=|wv l6x0eUxK&UqtYCJ5oW?kL9!J&WWjcbBwK%0VpVbc#1^}4sabN%d diff --git a/mobile/openapi/lib/api/asset_api.dart b/mobile/openapi/lib/api/asset_api.dart index 45c1e11043e5a286091657a594f7cc0eb531a59a..84b73ea9aa9d8488e2b8a40ce6212c17a253a79b 100644 GIT binary patch delta 2205 zcmdT^ZA?>V6i)fFG!`b`{elZ~P=rAzD)GimoQs1dbp$shb2Aotf%4JM+Ze`vu*_|0 zU>F|+1R62>v1sCCDH{}|kT4*h*NcZ2VSa>ZQh1q#{J3kh8vLwjM7s5sClr0obQnRsCCBksp26UzE z!}%-`&XRMxl=0CASc~3JzMImQ?Kc`2jg~E~fM7;`MkB&db{yD&6bvcj!)#W@QlN7z zD&qu@sl9ld{x#+@<}g1h#FtwRI(jm%2%eckk(WYucI2~hfLWr1O(jM0D^h4RDm1Ai z_(iod!cUQ=mZ_SX+(8cEwz^zQnbhd;h)GJeldxmpHOC9;U^deTo{@5a-c@RFuX-8{ zhCld#j2V>}YAtc}pNkZ%@|K#n!D8MS@Uu!%;W5h~x2QQL4r^0!ki*3aBSCc}kn7$- zWTO~MNs;*BaV+vWBm@gd_7#|f0`vpZqQbj*lG%N{tC!2^;c}X ziLqFXh5}tC6(|)SATE3ok1v{|dGb-8y3x?Wz)#$RnsXYwHzLIRXGhU8p@h683I|WA zNu`e9bXy31J6VB-Ha!XOO##|I&RR2Hu41Pf^VY+YOP1U&CZSRh%VE+K4`8yZg;h)~ zO_2ph>~Z2%rG&?xgq$WRN$;`XH8bT3y|FoWJxn<{Y(6{nKN)5Jo5{6SJ+kw_dU*LW zn6mEd5pfoE$zrhJ_6xD@rUGJT0_r`R@Io(zQ=UYaE=1tGdk-%5rK6@N+EMsTumDG$ zDX8yB;nn-HGY6($Low0w5{9SuA;T->-$&e(q0=eG%$ZpH-WSKu8~e13x8L`sp}sc^ zU-c#vtKj_$-ASuv(uqC^=?D?t|273`&yMBp*o1!Pi*cnDOlg(XRdlY+ynPk1-`C&KnE; zNpQ_1JZ(wLeJa7r|(Zpe#9IJ$U%z(?+OrWn>VRs$EY{rlL z2rC%Z@%nU+)ZpTG;{-GQamG!c=SBcU-rVQ7_*}ns`J}3Vd}%6xGAT~LWKULtjWz>o z;kJH&%GpHhC(lFQRuN)NMLfudWTG1ZL0sxj)AYMOcqG3-mg{W+<~Xwfki znj!{U=H3u-5~q2gqk2x7!AY8?{KDo0&22c7NwL~0#;~W1<(zqpKW9_0I4j4bBm7#Ed(PAM zzW2V*Irlv0oH#B#aa`DQKM5XZs7s^4U6lxN>*w2-r{FbJi4x>HK zzyv(5w1V$l7*U(yQABx5lWMq#NcVoo}Z;ODtB?A97rKheEl(3VEL=!`+;~z4>Ae`EK_VDF0;lirANWWjJ&&dljr> zK^4oP>J*a

+8{67+KPOc0=}Q;Mc}ISTDkG!T5FQ;rLrvE0YhFM?Bz(E?Pv8dnrS zApguNA}B-Rk(rg`y@vaz=q&-s_46xYD(%>@3YNh*;HZI+w1*e%W*i2?CbSbOkj z63}@i8rMeFBI=43UyexD2c`YKvBFxYXRGn{@Fui-*GV0$o+ZsJc)zmFSf#b^jlYY(zcpZZbRV{# zEy2l&GJJ7X5BC^{$qQ9DJYIsG6NQ0}dE+H94)kq!nv0{roB8w?hE1kM_nbV;M8=}Y zfP$+rG5#_p6O&k)s`L^R6Dfa#j=!0bXCej?p=X@Q1lJ`PKB zvFIjiO$)KuwV*;4@res^L@Y$3nerenuqSl9L&^wQ!jbA_z4xHLoPIq%x$kAa(P0?st3u D;E^p_ delta 125 zcmZ2#y3};TX12-q*o-E3b7@Z&V7H$f&o0jAl30=&l9`*TkeF7IS~NL;TY2&wKKsen y*gsBY=B%7Nhr?!b4JSV%l0M1FjNDq-^@a(i=9OfYREAU*r0PIS+`OIp9UlO@4J)Yt diff --git a/mobile/openapi/lib/api/search_api.dart b/mobile/openapi/lib/api/search_api.dart index 5dd8dc0c7044577e168191fdaf88e21af8c665bf..2efae6838a1e030c4e2fbbd4c856edc059ea7199 100644 GIT binary patch delta 294 zcmZ2zywG^VBlgMp9Bh*nI7ET8?BoSP9Ft$Mn@x`35C^kuIix4o@rh4f$ssS9l%Jnt zuaKORS)ii;Vdv(TWaj7TOy0<+C{mP~oSIjnqYzwDl$n=quTWB1kUEK9b+a`m8zT!y z)8vKR=9AU9WhejSj+^YrwQBNgAnnW@u{oTloRJ7en2_aw0BMljR#0a{9BickbGSdh Xs1(HERthi=fE;cGcK+sB{Onu+62@Wa delta 309 zcmZ2zywG^VBlgJ(e4LZ{`AjFjU>60lIVP8LNKcO75TAUGmu>QUUI<;sCq8*4hy3J6 z9142LIhh4I3c)2snR)5<3MG{VsX7Wt`T05a3Pq{Osd*(ZUT%I#W`5oze$~y^oNSDf zzjLjc?8p@{`9F8Wg8KvF11kjxy?GWtI~M?mf@z8X diff --git a/mobile/openapi/lib/api/shared_link_api.dart b/mobile/openapi/lib/api/shared_link_api.dart index 661da45eb8d59c433e3d7b4bca79ba2cb58b6b6e..e43ee615c38d5fa30f6af827e9efc4685254dc81 100644 GIT binary patch delta 126 zcmZ3TzdC=zO0miJb=W6w6%(D@Bc(NYvw+BCW^rYf?9@t~$+F@~n|;J(87K2-`%X@j z*grW^TX}Mvn#JS`l6z2eU6Qhd>zEv@t2Q}YT9y-Ngp~r=oMLI^%?A~yGEJ@&5SW~) LQn7ij+&c*X8H_Az delta 113 zcmZ3TzdC=zO0mf+q_iea5tErL&&ED^mjLf%W^v`o64H{B*J>tCULbyQ@;-^}lM^LE zCr4^4PmWWwn0!HU4~m|fQbthqGLs#oO(xe#D{X$r_JVQpeC6$vD+L55XR1_e-YfS` F0svycDt!O| diff --git a/mobile/openapi/test/activity_api_test.dart b/mobile/openapi/test/activity_api_test.dart index 7353c6ea3592d11d85292f3fecf6d0f1ed309efd..05ffd928e0f14241c27d8f7401a4771a10307066 100644 GIT binary patch delta 43 ucmaFP@tk9W5wo06YFTQILJo-3Q3y&+OfJdH&kLz6NL45S5}N~<#Tfxy6Av{2 delta 43 ucmaFP@tk9W5wl!KWkIS!36RiH2ue*%F3HT#^GPjB%~8k!k(&dU#TfxzSr0V; diff --git a/mobile/openapi/test/album_api_test.dart b/mobile/openapi/test/album_api_test.dart index af4cd2a45bd5051f4de2150ab193382238a1a529..aee26e095d56215e5764569073db3a7d79398f63 100644 GIT binary patch delta 83 zcmbQrKb3#Ob{4tdlA_GKbcO8HN*#ry{QMk+^30Nq{L&J~;^Nej;>n6kl9S)Dq)J1T ZC4xjfQ=m$VGZKqZQ$T7qx3lsw0RZ|Q9X0>} delta 72 zcmbQrKb3#Ob{65J{QMk+^30Nq{L&J~;^NejVx7riOe&M#v7}0a<%%;Bi&9f`6oN~N XGV{_E5!TT92 diff --git a/mobile/openapi/test/asset_api_test.dart b/mobile/openapi/test/asset_api_test.dart index c4f6c85112272a227e882697987046f538ad3d2f..b87cacf29adf184a130b0f2d8fe565836779de6a 100644 GIT binary patch delta 533 zcmcIhJx{_=6b(iiG$;jHKE#iT7zc?Hao0#9CKwXjoF46izO;R9-g^zH(Zydta(@An zqaoO*o?>xicYFs@@@aGK zZQ-D*&1(-c?$U-40l#)tt>e13)+fSjAtvaQwFI>V(k&RS?ZQA_2b#M7&l%xB9JCg8Gi;p&o{os;aYwlRF$~xIhAuY5~3#4Zf889z)#3#yRe~Y|1+0 r9E+R4!}Xa`1m5CLg+A_hEhNmP951kq1zakX%_!|fw52eUtFQh5i;28j delta 474 zcmbtRJxjw-6h+b0swKgE_<_PBR#505QoC1lsL(2OaeYZ{o6s~V@4XNz4lWK3ovz?s z3N8*peuH}lq5r`}T%ByBM0c0VJ?CD|J)Ao!Ps%Un65dK0o+ujL=T-cYmoe5WD_*M+ z22iKMc9XI6wun4$;%N04$I^DPUU-_@i#V{FQzA{lyr4~}Z$;fdxCe}f0e;98*$P9S z#GY`Qg4!LxhGO7wVHXEV0R#Ew|4PX~8O>|nuNmL77-jvMgH$(^D(4_Bm;;Q2X~jGB zaLIPT?(nFKpYj&Is~wWLJOv*FOvN(h$2Y#}MGVyqyiy51>M}k^BqtcM za@{fDGAT6bRPGSlcPi)O-kd cJ#@e?ks#`l9&Jz8(=I(Sea>dGW}Gd21L^XqPyhe` diff --git a/mobile/openapi/test/audit_api_test.dart b/mobile/openapi/test/audit_api_test.dart index 2ce8d3d8600947320c428974e63572bba8c6482f..8161d4e4dbfd49d00f70e97518002ed37aae89bb 100644 GIT binary patch delta 50 ycmbQsF_&XQIg_eOVo7R9W^SrNVp>URk&c3EUP)$2Wk_W~szNH9xp@v#BO?IGnG$sX delta 50 ycmbQsF_&XQIg_euUP)$2Wk_W~szNH9siWYMSdto&nVYJRm{yWnw0RCwBO?ITyb^T) diff --git a/mobile/openapi/test/search_api_test.dart b/mobile/openapi/test/search_api_test.dart index edbbfa45b7e640cc74a89e3a4dc9f562cfe1a196..50406e90d159b67366dc223e9b1e60fb1d00a5dc 100644 GIT binary patch delta 59 zcmdnMzJYy19+P-detwQZa!zJ}jslpOn_rTdpQkf9mq|{zC^b1XuS7>7xTGjEFI}Oe LvLJQxHl|+yYakVp delta 84 zcmdnMzJYy19+O9KNl|8Axw=w+!0QdtQ=>Px# diff --git a/mobile/openapi/test/shared_link_api_test.dart b/mobile/openapi/test/shared_link_api_test.dart index edc2c55d0a200ac9615a8b90386f24eb339ad731..ebe5bf199f7efa1eb2126fae11e293e644c5a341 100644 GIT binary patch delta 28 kcmcb|dyjX+H)fXX)JmPn@0jJ76ly2uFiUMVVOhll0HP)d?EnA( delta 22 ecmcb|dyjX+H|EJqEMkm0lXaL>HXE|6WdZ => { + getActivities: async (albumId: string, assetId?: string, level?: ReactionLevel, type?: ReactionType, userId?: string, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'albumId' is not null or undefined assertParamExists('getActivities', 'albumId', albumId) const localVarPath = `/activity`; @@ -5425,14 +5425,14 @@ export const ActivityApiAxiosParamCreator = function (configuration?: Configurat localVarQueryParameter['assetId'] = assetId; } - if (type !== undefined) { - localVarQueryParameter['type'] = type; - } - if (level !== undefined) { localVarQueryParameter['level'] = level; } + if (type !== undefined) { + localVarQueryParameter['type'] = type; + } + if (userId !== undefined) { localVarQueryParameter['userId'] = userId; } @@ -5532,14 +5532,14 @@ export const ActivityApiFp = function(configuration?: Configuration) { * * @param {string} albumId * @param {string} [assetId] - * @param {ReactionType} [type] * @param {ReactionLevel} [level] + * @param {ReactionType} [type] * @param {string} [userId] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getActivities(albumId: string, assetId?: string, type?: ReactionType, level?: ReactionLevel, userId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getActivities(albumId, assetId, type, level, userId, options); + async getActivities(albumId: string, assetId?: string, level?: ReactionLevel, type?: ReactionType, userId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getActivities(albumId, assetId, level, type, userId, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -5588,7 +5588,7 @@ export const ActivityApiFactory = function (configuration?: Configuration, baseP * @throws {RequiredError} */ getActivities(requestParameters: ActivityApiGetActivitiesRequest, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getActivities(requestParameters.albumId, requestParameters.assetId, requestParameters.type, requestParameters.level, requestParameters.userId, options).then((request) => request(axios, basePath)); + return localVarFp.getActivities(requestParameters.albumId, requestParameters.assetId, requestParameters.level, requestParameters.type, requestParameters.userId, options).then((request) => request(axios, basePath)); }, /** * @@ -5650,13 +5650,6 @@ export interface ActivityApiGetActivitiesRequest { */ readonly assetId?: string - /** - * - * @type {ReactionType} - * @memberof ActivityApiGetActivities - */ - readonly type?: ReactionType - /** * * @type {ReactionLevel} @@ -5664,6 +5657,13 @@ export interface ActivityApiGetActivitiesRequest { */ readonly level?: ReactionLevel + /** + * + * @type {ReactionType} + * @memberof ActivityApiGetActivities + */ + readonly type?: ReactionType + /** * * @type {string} @@ -5730,7 +5730,7 @@ export class ActivityApi extends BaseAPI { * @memberof ActivityApi */ public getActivities(requestParameters: ActivityApiGetActivitiesRequest, options?: AxiosRequestConfig) { - return ActivityApiFp(this.configuration).getActivities(requestParameters.albumId, requestParameters.assetId, requestParameters.type, requestParameters.level, requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); + return ActivityApiFp(this.configuration).getActivities(requestParameters.albumId, requestParameters.assetId, requestParameters.level, requestParameters.type, requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); } /** @@ -5980,12 +5980,12 @@ export const AlbumApiAxiosParamCreator = function (configuration?: Configuration /** * * @param {string} id - * @param {boolean} [withoutAssets] * @param {string} [key] + * @param {boolean} [withoutAssets] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAlbumInfo: async (id: string, withoutAssets?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise => { + getAlbumInfo: async (id: string, key?: string, withoutAssets?: boolean, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'id' is not null or undefined assertParamExists('getAlbumInfo', 'id', id) const localVarPath = `/album/{id}` @@ -6010,14 +6010,14 @@ export const AlbumApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) - if (withoutAssets !== undefined) { - localVarQueryParameter['withoutAssets'] = withoutAssets; - } - if (key !== undefined) { localVarQueryParameter['key'] = key; } + if (withoutAssets !== undefined) { + localVarQueryParameter['withoutAssets'] = withoutAssets; + } + setSearchParams(localVarUrlObj, localVarQueryParameter); @@ -6031,12 +6031,12 @@ export const AlbumApiAxiosParamCreator = function (configuration?: Configuration }, /** * - * @param {boolean} [shared] * @param {string} [assetId] Only returns albums that contain the asset Ignores the shared parameter undefined: get all albums + * @param {boolean} [shared] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAllAlbums: async (shared?: boolean, assetId?: string, options: AxiosRequestConfig = {}): Promise => { + getAllAlbums: async (assetId?: string, shared?: boolean, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/album`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -6058,14 +6058,14 @@ export const AlbumApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) - if (shared !== undefined) { - localVarQueryParameter['shared'] = shared; - } - if (assetId !== undefined) { localVarQueryParameter['assetId'] = assetId; } + if (shared !== undefined) { + localVarQueryParameter['shared'] = shared; + } + setSearchParams(localVarUrlObj, localVarQueryParameter); @@ -6284,24 +6284,24 @@ export const AlbumApiFp = function(configuration?: Configuration) { /** * * @param {string} id - * @param {boolean} [withoutAssets] * @param {string} [key] + * @param {boolean} [withoutAssets] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getAlbumInfo(id: string, withoutAssets?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAlbumInfo(id, withoutAssets, key, options); + async getAlbumInfo(id: string, key?: string, withoutAssets?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getAlbumInfo(id, key, withoutAssets, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** * - * @param {boolean} [shared] * @param {string} [assetId] Only returns albums that contain the asset Ignores the shared parameter undefined: get all albums + * @param {boolean} [shared] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getAllAlbums(shared?: boolean, assetId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAllAlbums(shared, assetId, options); + async getAllAlbums(assetId?: string, shared?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getAllAlbums(assetId, shared, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -6398,7 +6398,7 @@ export const AlbumApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ getAlbumInfo(requestParameters: AlbumApiGetAlbumInfoRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getAlbumInfo(requestParameters.id, requestParameters.withoutAssets, requestParameters.key, options).then((request) => request(axios, basePath)); + return localVarFp.getAlbumInfo(requestParameters.id, requestParameters.key, requestParameters.withoutAssets, options).then((request) => request(axios, basePath)); }, /** * @@ -6407,7 +6407,7 @@ export const AlbumApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ getAllAlbums(requestParameters: AlbumApiGetAllAlbumsRequest = {}, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getAllAlbums(requestParameters.shared, requestParameters.assetId, options).then((request) => request(axios, basePath)); + return localVarFp.getAllAlbums(requestParameters.assetId, requestParameters.shared, options).then((request) => request(axios, basePath)); }, /** * @@ -6529,19 +6529,19 @@ export interface AlbumApiGetAlbumInfoRequest { */ readonly id: string - /** - * - * @type {boolean} - * @memberof AlbumApiGetAlbumInfo - */ - readonly withoutAssets?: boolean - /** * * @type {string} * @memberof AlbumApiGetAlbumInfo */ readonly key?: string + + /** + * + * @type {boolean} + * @memberof AlbumApiGetAlbumInfo + */ + readonly withoutAssets?: boolean } /** @@ -6550,19 +6550,19 @@ export interface AlbumApiGetAlbumInfoRequest { * @interface AlbumApiGetAllAlbumsRequest */ export interface AlbumApiGetAllAlbumsRequest { - /** - * - * @type {boolean} - * @memberof AlbumApiGetAllAlbums - */ - readonly shared?: boolean - /** * Only returns albums that contain the asset Ignores the shared parameter undefined: get all albums * @type {string} * @memberof AlbumApiGetAllAlbums */ readonly assetId?: string + + /** + * + * @type {boolean} + * @memberof AlbumApiGetAllAlbums + */ + readonly shared?: boolean } /** @@ -6697,7 +6697,7 @@ export class AlbumApi extends BaseAPI { * @memberof AlbumApi */ public getAlbumInfo(requestParameters: AlbumApiGetAlbumInfoRequest, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).getAlbumInfo(requestParameters.id, requestParameters.withoutAssets, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); + return AlbumApiFp(this.configuration).getAlbumInfo(requestParameters.id, requestParameters.key, requestParameters.withoutAssets, options).then((request) => request(this.axios, this.basePath)); } /** @@ -6708,7 +6708,7 @@ export class AlbumApi extends BaseAPI { * @memberof AlbumApi */ public getAllAlbums(requestParameters: AlbumApiGetAllAlbumsRequest = {}, options?: AxiosRequestConfig) { - return AlbumApiFp(this.configuration).getAllAlbums(requestParameters.shared, requestParameters.assetId, options).then((request) => request(this.axios, this.basePath)); + return AlbumApiFp(this.configuration).getAllAlbums(requestParameters.assetId, requestParameters.shared, options).then((request) => request(this.axios, this.basePath)); } /** @@ -7020,18 +7020,18 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration }, /** * Get all AssetEntity belong to the user + * @param {string} [ifNoneMatch] ETag of data already cached on the client + * @param {boolean} [isArchived] + * @param {boolean} [isFavorite] * @param {number} [skip] * @param {number} [take] - * @param {string} [userId] - * @param {boolean} [isFavorite] - * @param {boolean} [isArchived] * @param {string} [updatedAfter] * @param {string} [updatedBefore] - * @param {string} [ifNoneMatch] ETag of data already cached on the client + * @param {string} [userId] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAllAssets: async (skip?: number, take?: number, userId?: string, isFavorite?: boolean, isArchived?: boolean, updatedAfter?: string, updatedBefore?: string, ifNoneMatch?: string, options: AxiosRequestConfig = {}): Promise => { + getAllAssets: async (ifNoneMatch?: string, isArchived?: boolean, isFavorite?: boolean, skip?: number, take?: number, updatedAfter?: string, updatedBefore?: string, userId?: string, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/asset`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -7053,24 +7053,20 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) - if (skip !== undefined) { - localVarQueryParameter['skip'] = skip; - } - - if (take !== undefined) { - localVarQueryParameter['take'] = take; - } - - if (userId !== undefined) { - localVarQueryParameter['userId'] = userId; + if (isArchived !== undefined) { + localVarQueryParameter['isArchived'] = isArchived; } if (isFavorite !== undefined) { localVarQueryParameter['isFavorite'] = isFavorite; } - if (isArchived !== undefined) { - localVarQueryParameter['isArchived'] = isArchived; + if (skip !== undefined) { + localVarQueryParameter['skip'] = skip; + } + + if (take !== undefined) { + localVarQueryParameter['take'] = take; } if (updatedAfter !== undefined) { @@ -7085,6 +7081,10 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration updatedBefore; } + if (userId !== undefined) { + localVarQueryParameter['userId'] = userId; + } + if (ifNoneMatch != null) { localVarHeaderParameter['if-none-match'] = String(ifNoneMatch); } @@ -7459,14 +7459,14 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration }, /** * - * @param {boolean} [isArchived] - * @param {boolean} [isFavorite] * @param {string} [fileCreatedAfter] * @param {string} [fileCreatedBefore] + * @param {boolean} [isArchived] + * @param {boolean} [isFavorite] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getMapMarkers: async (isArchived?: boolean, isFavorite?: boolean, fileCreatedAfter?: string, fileCreatedBefore?: string, options: AxiosRequestConfig = {}): Promise => { + getMapMarkers: async (fileCreatedAfter?: string, fileCreatedBefore?: string, isArchived?: boolean, isFavorite?: boolean, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/asset/map-marker`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -7488,14 +7488,6 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) - if (isArchived !== undefined) { - localVarQueryParameter['isArchived'] = isArchived; - } - - if (isFavorite !== undefined) { - localVarQueryParameter['isFavorite'] = isFavorite; - } - if (fileCreatedAfter !== undefined) { localVarQueryParameter['fileCreatedAfter'] = (fileCreatedAfter as any instanceof Date) ? (fileCreatedAfter as any).toISOString() : @@ -7508,6 +7500,14 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration fileCreatedBefore; } + if (isArchived !== undefined) { + localVarQueryParameter['isArchived'] = isArchived; + } + + if (isFavorite !== undefined) { + localVarQueryParameter['isFavorite'] = isFavorite; + } + setSearchParams(localVarUrlObj, localVarQueryParameter); @@ -7618,19 +7618,19 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration * * @param {TimeBucketSize} size * @param {string} timeBucket - * @param {string} [userId] * @param {string} [albumId] - * @param {string} [personId] * @param {boolean} [isArchived] * @param {boolean} [isFavorite] * @param {boolean} [isTrashed] - * @param {boolean} [withStacked] - * @param {boolean} [withPartners] * @param {string} [key] + * @param {string} [personId] + * @param {string} [userId] + * @param {boolean} [withPartners] + * @param {boolean} [withStacked] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getTimeBucket: async (size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, withPartners?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise => { + getTimeBucket: async (size: TimeBucketSize, timeBucket: string, albumId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, key?: string, personId?: string, userId?: string, withPartners?: boolean, withStacked?: boolean, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'size' is not null or undefined assertParamExists('getTimeBucket', 'size', size) // verify required parameter 'timeBucket' is not null or undefined @@ -7656,22 +7656,10 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) - if (size !== undefined) { - localVarQueryParameter['size'] = size; - } - - if (userId !== undefined) { - localVarQueryParameter['userId'] = userId; - } - if (albumId !== undefined) { localVarQueryParameter['albumId'] = albumId; } - if (personId !== undefined) { - localVarQueryParameter['personId'] = personId; - } - if (isArchived !== undefined) { localVarQueryParameter['isArchived'] = isArchived; } @@ -7684,20 +7672,32 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration localVarQueryParameter['isTrashed'] = isTrashed; } - if (withStacked !== undefined) { - localVarQueryParameter['withStacked'] = withStacked; + if (key !== undefined) { + localVarQueryParameter['key'] = key; } - if (withPartners !== undefined) { - localVarQueryParameter['withPartners'] = withPartners; + if (personId !== undefined) { + localVarQueryParameter['personId'] = personId; + } + + if (size !== undefined) { + localVarQueryParameter['size'] = size; } if (timeBucket !== undefined) { localVarQueryParameter['timeBucket'] = timeBucket; } - if (key !== undefined) { - localVarQueryParameter['key'] = key; + if (userId !== undefined) { + localVarQueryParameter['userId'] = userId; + } + + if (withPartners !== undefined) { + localVarQueryParameter['withPartners'] = withPartners; + } + + if (withStacked !== undefined) { + localVarQueryParameter['withStacked'] = withStacked; } @@ -7714,19 +7714,19 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration /** * * @param {TimeBucketSize} size - * @param {string} [userId] * @param {string} [albumId] - * @param {string} [personId] * @param {boolean} [isArchived] * @param {boolean} [isFavorite] * @param {boolean} [isTrashed] - * @param {boolean} [withStacked] - * @param {boolean} [withPartners] * @param {string} [key] + * @param {string} [personId] + * @param {string} [userId] + * @param {boolean} [withPartners] + * @param {boolean} [withStacked] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getTimeBuckets: async (size: TimeBucketSize, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, withPartners?: boolean, key?: string, options: AxiosRequestConfig = {}): Promise => { + getTimeBuckets: async (size: TimeBucketSize, albumId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, key?: string, personId?: string, userId?: string, withPartners?: boolean, withStacked?: boolean, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'size' is not null or undefined assertParamExists('getTimeBuckets', 'size', size) const localVarPath = `/asset/time-buckets`; @@ -7750,22 +7750,10 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) - if (size !== undefined) { - localVarQueryParameter['size'] = size; - } - - if (userId !== undefined) { - localVarQueryParameter['userId'] = userId; - } - if (albumId !== undefined) { localVarQueryParameter['albumId'] = albumId; } - if (personId !== undefined) { - localVarQueryParameter['personId'] = personId; - } - if (isArchived !== undefined) { localVarQueryParameter['isArchived'] = isArchived; } @@ -7778,16 +7766,28 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration localVarQueryParameter['isTrashed'] = isTrashed; } - if (withStacked !== undefined) { - localVarQueryParameter['withStacked'] = withStacked; + if (key !== undefined) { + localVarQueryParameter['key'] = key; + } + + if (personId !== undefined) { + localVarQueryParameter['personId'] = personId; + } + + if (size !== undefined) { + localVarQueryParameter['size'] = size; + } + + if (userId !== undefined) { + localVarQueryParameter['userId'] = userId; } if (withPartners !== undefined) { localVarQueryParameter['withPartners'] = withPartners; } - if (key !== undefined) { - localVarQueryParameter['key'] = key; + if (withStacked !== undefined) { + localVarQueryParameter['withStacked'] = withStacked; } @@ -7973,13 +7973,15 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration }, /** * - * @param {string} [id] - * @param {string} [libraryId] - * @param {AssetTypeEnum} [type] - * @param {AssetOrder} [order] + * @param {string} [checksum] + * @param {string} [city] + * @param {string} [country] + * @param {string} [createdAfter] + * @param {string} [createdBefore] * @param {string} [deviceAssetId] * @param {string} [deviceId] - * @param {string} [checksum] + * @param {string} [encodedVideoPath] + * @param {string} [id] * @param {boolean} [isArchived] * @param {boolean} [isEncoded] * @param {boolean} [isExternal] @@ -7988,35 +7990,33 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration * @param {boolean} [isOffline] * @param {boolean} [isReadOnly] * @param {boolean} [isVisible] - * @param {boolean} [withDeleted] - * @param {boolean} [withStacked] - * @param {boolean} [withExif] - * @param {boolean} [withPeople] - * @param {string} [createdBefore] - * @param {string} [createdAfter] - * @param {string} [updatedBefore] - * @param {string} [updatedAfter] - * @param {string} [trashedBefore] - * @param {string} [trashedAfter] - * @param {string} [takenBefore] - * @param {string} [takenAfter] - * @param {string} [originalFileName] - * @param {string} [originalPath] - * @param {string} [resizePath] - * @param {string} [webpPath] - * @param {string} [encodedVideoPath] - * @param {string} [city] - * @param {string} [state] - * @param {string} [country] + * @param {string} [lensModel] + * @param {string} [libraryId] * @param {string} [make] * @param {string} [model] - * @param {string} [lensModel] + * @param {AssetOrder} [order] + * @param {string} [originalFileName] + * @param {string} [originalPath] * @param {number} [page] + * @param {string} [resizePath] * @param {number} [size] + * @param {string} [state] + * @param {string} [takenAfter] + * @param {string} [takenBefore] + * @param {string} [trashedAfter] + * @param {string} [trashedBefore] + * @param {AssetTypeEnum} [type] + * @param {string} [updatedAfter] + * @param {string} [updatedBefore] + * @param {string} [webpPath] + * @param {boolean} [withDeleted] + * @param {boolean} [withExif] + * @param {boolean} [withPeople] + * @param {boolean} [withStacked] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - searchAssets: async (id?: string, libraryId?: string, type?: AssetTypeEnum, order?: AssetOrder, deviceAssetId?: string, deviceId?: string, checksum?: string, isArchived?: boolean, isEncoded?: boolean, isExternal?: boolean, isFavorite?: boolean, isMotion?: boolean, isOffline?: boolean, isReadOnly?: boolean, isVisible?: boolean, withDeleted?: boolean, withStacked?: boolean, withExif?: boolean, withPeople?: boolean, createdBefore?: string, createdAfter?: string, updatedBefore?: string, updatedAfter?: string, trashedBefore?: string, trashedAfter?: string, takenBefore?: string, takenAfter?: string, originalFileName?: string, originalPath?: string, resizePath?: string, webpPath?: string, encodedVideoPath?: string, city?: string, state?: string, country?: string, make?: string, model?: string, lensModel?: string, page?: number, size?: number, options: AxiosRequestConfig = {}): Promise => { + searchAssets: async (checksum?: string, city?: string, country?: string, createdAfter?: string, createdBefore?: string, deviceAssetId?: string, deviceId?: string, encodedVideoPath?: string, id?: string, isArchived?: boolean, isEncoded?: boolean, isExternal?: boolean, isFavorite?: boolean, isMotion?: boolean, isOffline?: boolean, isReadOnly?: boolean, isVisible?: boolean, lensModel?: string, libraryId?: string, make?: string, model?: string, order?: AssetOrder, originalFileName?: string, originalPath?: string, page?: number, resizePath?: string, size?: number, state?: string, takenAfter?: string, takenBefore?: string, trashedAfter?: string, trashedBefore?: string, type?: AssetTypeEnum, updatedAfter?: string, updatedBefore?: string, webpPath?: string, withDeleted?: boolean, withExif?: boolean, withPeople?: boolean, withStacked?: boolean, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/assets`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -8038,20 +8038,28 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) - if (id !== undefined) { - localVarQueryParameter['id'] = id; + if (checksum !== undefined) { + localVarQueryParameter['checksum'] = checksum; } - if (libraryId !== undefined) { - localVarQueryParameter['libraryId'] = libraryId; + if (city !== undefined) { + localVarQueryParameter['city'] = city; } - if (type !== undefined) { - localVarQueryParameter['type'] = type; + if (country !== undefined) { + localVarQueryParameter['country'] = country; } - if (order !== undefined) { - localVarQueryParameter['order'] = order; + if (createdAfter !== undefined) { + localVarQueryParameter['createdAfter'] = (createdAfter as any instanceof Date) ? + (createdAfter as any).toISOString() : + createdAfter; + } + + if (createdBefore !== undefined) { + localVarQueryParameter['createdBefore'] = (createdBefore as any instanceof Date) ? + (createdBefore as any).toISOString() : + createdBefore; } if (deviceAssetId !== undefined) { @@ -8062,8 +8070,12 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration localVarQueryParameter['deviceId'] = deviceId; } - if (checksum !== undefined) { - localVarQueryParameter['checksum'] = checksum; + if (encodedVideoPath !== undefined) { + localVarQueryParameter['encodedVideoPath'] = encodedVideoPath; + } + + if (id !== undefined) { + localVarQueryParameter['id'] = id; } if (isArchived !== undefined) { @@ -8098,100 +8110,12 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration localVarQueryParameter['isVisible'] = isVisible; } - if (withDeleted !== undefined) { - localVarQueryParameter['withDeleted'] = withDeleted; + if (lensModel !== undefined) { + localVarQueryParameter['lensModel'] = lensModel; } - if (withStacked !== undefined) { - localVarQueryParameter['withStacked'] = withStacked; - } - - if (withExif !== undefined) { - localVarQueryParameter['withExif'] = withExif; - } - - if (withPeople !== undefined) { - localVarQueryParameter['withPeople'] = withPeople; - } - - if (createdBefore !== undefined) { - localVarQueryParameter['createdBefore'] = (createdBefore as any instanceof Date) ? - (createdBefore as any).toISOString() : - createdBefore; - } - - if (createdAfter !== undefined) { - localVarQueryParameter['createdAfter'] = (createdAfter as any instanceof Date) ? - (createdAfter as any).toISOString() : - createdAfter; - } - - if (updatedBefore !== undefined) { - localVarQueryParameter['updatedBefore'] = (updatedBefore as any instanceof Date) ? - (updatedBefore as any).toISOString() : - updatedBefore; - } - - if (updatedAfter !== undefined) { - localVarQueryParameter['updatedAfter'] = (updatedAfter as any instanceof Date) ? - (updatedAfter as any).toISOString() : - updatedAfter; - } - - if (trashedBefore !== undefined) { - localVarQueryParameter['trashedBefore'] = (trashedBefore as any instanceof Date) ? - (trashedBefore as any).toISOString() : - trashedBefore; - } - - if (trashedAfter !== undefined) { - localVarQueryParameter['trashedAfter'] = (trashedAfter as any instanceof Date) ? - (trashedAfter as any).toISOString() : - trashedAfter; - } - - if (takenBefore !== undefined) { - localVarQueryParameter['takenBefore'] = (takenBefore as any instanceof Date) ? - (takenBefore as any).toISOString() : - takenBefore; - } - - if (takenAfter !== undefined) { - localVarQueryParameter['takenAfter'] = (takenAfter as any instanceof Date) ? - (takenAfter as any).toISOString() : - takenAfter; - } - - if (originalFileName !== undefined) { - localVarQueryParameter['originalFileName'] = originalFileName; - } - - if (originalPath !== undefined) { - localVarQueryParameter['originalPath'] = originalPath; - } - - if (resizePath !== undefined) { - localVarQueryParameter['resizePath'] = resizePath; - } - - if (webpPath !== undefined) { - localVarQueryParameter['webpPath'] = webpPath; - } - - if (encodedVideoPath !== undefined) { - localVarQueryParameter['encodedVideoPath'] = encodedVideoPath; - } - - if (city !== undefined) { - localVarQueryParameter['city'] = city; - } - - if (state !== undefined) { - localVarQueryParameter['state'] = state; - } - - if (country !== undefined) { - localVarQueryParameter['country'] = country; + if (libraryId !== undefined) { + localVarQueryParameter['libraryId'] = libraryId; } if (make !== undefined) { @@ -8202,18 +8126,94 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration localVarQueryParameter['model'] = model; } - if (lensModel !== undefined) { - localVarQueryParameter['lensModel'] = lensModel; + if (order !== undefined) { + localVarQueryParameter['order'] = order; + } + + if (originalFileName !== undefined) { + localVarQueryParameter['originalFileName'] = originalFileName; + } + + if (originalPath !== undefined) { + localVarQueryParameter['originalPath'] = originalPath; } if (page !== undefined) { localVarQueryParameter['page'] = page; } + if (resizePath !== undefined) { + localVarQueryParameter['resizePath'] = resizePath; + } + if (size !== undefined) { localVarQueryParameter['size'] = size; } + if (state !== undefined) { + localVarQueryParameter['state'] = state; + } + + if (takenAfter !== undefined) { + localVarQueryParameter['takenAfter'] = (takenAfter as any instanceof Date) ? + (takenAfter as any).toISOString() : + takenAfter; + } + + if (takenBefore !== undefined) { + localVarQueryParameter['takenBefore'] = (takenBefore as any instanceof Date) ? + (takenBefore as any).toISOString() : + takenBefore; + } + + if (trashedAfter !== undefined) { + localVarQueryParameter['trashedAfter'] = (trashedAfter as any instanceof Date) ? + (trashedAfter as any).toISOString() : + trashedAfter; + } + + if (trashedBefore !== undefined) { + localVarQueryParameter['trashedBefore'] = (trashedBefore as any instanceof Date) ? + (trashedBefore as any).toISOString() : + trashedBefore; + } + + if (type !== undefined) { + localVarQueryParameter['type'] = type; + } + + if (updatedAfter !== undefined) { + localVarQueryParameter['updatedAfter'] = (updatedAfter as any instanceof Date) ? + (updatedAfter as any).toISOString() : + updatedAfter; + } + + if (updatedBefore !== undefined) { + localVarQueryParameter['updatedBefore'] = (updatedBefore as any instanceof Date) ? + (updatedBefore as any).toISOString() : + updatedBefore; + } + + if (webpPath !== undefined) { + localVarQueryParameter['webpPath'] = webpPath; + } + + if (withDeleted !== undefined) { + localVarQueryParameter['withDeleted'] = withDeleted; + } + + if (withExif !== undefined) { + localVarQueryParameter['withExif'] = withExif; + } + + if (withPeople !== undefined) { + localVarQueryParameter['withPeople'] = withPeople; + } + + if (withStacked !== undefined) { + localVarQueryParameter['withStacked'] = withStacked; + } + setSearchParams(localVarUrlObj, localVarQueryParameter); @@ -8623,19 +8623,19 @@ export const AssetApiFp = function(configuration?: Configuration) { }, /** * Get all AssetEntity belong to the user + * @param {string} [ifNoneMatch] ETag of data already cached on the client + * @param {boolean} [isArchived] + * @param {boolean} [isFavorite] * @param {number} [skip] * @param {number} [take] - * @param {string} [userId] - * @param {boolean} [isFavorite] - * @param {boolean} [isArchived] * @param {string} [updatedAfter] * @param {string} [updatedBefore] - * @param {string} [ifNoneMatch] ETag of data already cached on the client + * @param {string} [userId] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getAllAssets(skip?: number, take?: number, userId?: string, isFavorite?: boolean, isArchived?: boolean, updatedAfter?: string, updatedBefore?: string, ifNoneMatch?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAllAssets(skip, take, userId, isFavorite, isArchived, updatedAfter, updatedBefore, ifNoneMatch, options); + async getAllAssets(ifNoneMatch?: string, isArchived?: boolean, isFavorite?: boolean, skip?: number, take?: number, updatedAfter?: string, updatedBefore?: string, userId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getAllAssets(ifNoneMatch, isArchived, isFavorite, skip, take, updatedAfter, updatedBefore, userId, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -8723,15 +8723,15 @@ export const AssetApiFp = function(configuration?: Configuration) { }, /** * - * @param {boolean} [isArchived] - * @param {boolean} [isFavorite] * @param {string} [fileCreatedAfter] * @param {string} [fileCreatedBefore] + * @param {boolean} [isArchived] + * @param {boolean} [isFavorite] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getMapMarkers(isArchived?: boolean, isFavorite?: boolean, fileCreatedAfter?: string, fileCreatedBefore?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getMapMarkers(isArchived, isFavorite, fileCreatedAfter, fileCreatedBefore, options); + async getMapMarkers(fileCreatedAfter?: string, fileCreatedBefore?: string, isArchived?: boolean, isFavorite?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getMapMarkers(fileCreatedAfter, fileCreatedBefore, isArchived, isFavorite, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -8759,39 +8759,39 @@ export const AssetApiFp = function(configuration?: Configuration) { * * @param {TimeBucketSize} size * @param {string} timeBucket - * @param {string} [userId] * @param {string} [albumId] - * @param {string} [personId] * @param {boolean} [isArchived] * @param {boolean} [isFavorite] * @param {boolean} [isTrashed] - * @param {boolean} [withStacked] - * @param {boolean} [withPartners] * @param {string} [key] + * @param {string} [personId] + * @param {string} [userId] + * @param {boolean} [withPartners] + * @param {boolean} [withStacked] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getTimeBucket(size: TimeBucketSize, timeBucket: string, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, withPartners?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, withPartners, key, options); + async getTimeBucket(size: TimeBucketSize, timeBucket: string, albumId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, key?: string, personId?: string, userId?: string, withPartners?: boolean, withStacked?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getTimeBucket(size, timeBucket, albumId, isArchived, isFavorite, isTrashed, key, personId, userId, withPartners, withStacked, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** * * @param {TimeBucketSize} size - * @param {string} [userId] * @param {string} [albumId] - * @param {string} [personId] * @param {boolean} [isArchived] * @param {boolean} [isFavorite] * @param {boolean} [isTrashed] - * @param {boolean} [withStacked] - * @param {boolean} [withPartners] * @param {string} [key] + * @param {string} [personId] + * @param {string} [userId] + * @param {boolean} [withPartners] + * @param {boolean} [withStacked] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getTimeBuckets(size: TimeBucketSize, userId?: string, albumId?: string, personId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, withStacked?: boolean, withPartners?: boolean, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getTimeBuckets(size, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, withPartners, key, options); + async getTimeBuckets(size: TimeBucketSize, albumId?: string, isArchived?: boolean, isFavorite?: boolean, isTrashed?: boolean, key?: string, personId?: string, userId?: string, withPartners?: boolean, withStacked?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getTimeBuckets(size, albumId, isArchived, isFavorite, isTrashed, key, personId, userId, withPartners, withStacked, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -8837,13 +8837,15 @@ export const AssetApiFp = function(configuration?: Configuration) { }, /** * - * @param {string} [id] - * @param {string} [libraryId] - * @param {AssetTypeEnum} [type] - * @param {AssetOrder} [order] + * @param {string} [checksum] + * @param {string} [city] + * @param {string} [country] + * @param {string} [createdAfter] + * @param {string} [createdBefore] * @param {string} [deviceAssetId] * @param {string} [deviceId] - * @param {string} [checksum] + * @param {string} [encodedVideoPath] + * @param {string} [id] * @param {boolean} [isArchived] * @param {boolean} [isEncoded] * @param {boolean} [isExternal] @@ -8852,36 +8854,34 @@ export const AssetApiFp = function(configuration?: Configuration) { * @param {boolean} [isOffline] * @param {boolean} [isReadOnly] * @param {boolean} [isVisible] - * @param {boolean} [withDeleted] - * @param {boolean} [withStacked] - * @param {boolean} [withExif] - * @param {boolean} [withPeople] - * @param {string} [createdBefore] - * @param {string} [createdAfter] - * @param {string} [updatedBefore] - * @param {string} [updatedAfter] - * @param {string} [trashedBefore] - * @param {string} [trashedAfter] - * @param {string} [takenBefore] - * @param {string} [takenAfter] - * @param {string} [originalFileName] - * @param {string} [originalPath] - * @param {string} [resizePath] - * @param {string} [webpPath] - * @param {string} [encodedVideoPath] - * @param {string} [city] - * @param {string} [state] - * @param {string} [country] + * @param {string} [lensModel] + * @param {string} [libraryId] * @param {string} [make] * @param {string} [model] - * @param {string} [lensModel] + * @param {AssetOrder} [order] + * @param {string} [originalFileName] + * @param {string} [originalPath] * @param {number} [page] + * @param {string} [resizePath] * @param {number} [size] + * @param {string} [state] + * @param {string} [takenAfter] + * @param {string} [takenBefore] + * @param {string} [trashedAfter] + * @param {string} [trashedBefore] + * @param {AssetTypeEnum} [type] + * @param {string} [updatedAfter] + * @param {string} [updatedBefore] + * @param {string} [webpPath] + * @param {boolean} [withDeleted] + * @param {boolean} [withExif] + * @param {boolean} [withPeople] + * @param {boolean} [withStacked] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async searchAssets(id?: string, libraryId?: string, type?: AssetTypeEnum, order?: AssetOrder, deviceAssetId?: string, deviceId?: string, checksum?: string, isArchived?: boolean, isEncoded?: boolean, isExternal?: boolean, isFavorite?: boolean, isMotion?: boolean, isOffline?: boolean, isReadOnly?: boolean, isVisible?: boolean, withDeleted?: boolean, withStacked?: boolean, withExif?: boolean, withPeople?: boolean, createdBefore?: string, createdAfter?: string, updatedBefore?: string, updatedAfter?: string, trashedBefore?: string, trashedAfter?: string, takenBefore?: string, takenAfter?: string, originalFileName?: string, originalPath?: string, resizePath?: string, webpPath?: string, encodedVideoPath?: string, city?: string, state?: string, country?: string, make?: string, model?: string, lensModel?: string, page?: number, size?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { - const localVarAxiosArgs = await localVarAxiosParamCreator.searchAssets(id, libraryId, type, order, deviceAssetId, deviceId, checksum, isArchived, isEncoded, isExternal, isFavorite, isMotion, isOffline, isReadOnly, isVisible, withDeleted, withStacked, withExif, withPeople, createdBefore, createdAfter, updatedBefore, updatedAfter, trashedBefore, trashedAfter, takenBefore, takenAfter, originalFileName, originalPath, resizePath, webpPath, encodedVideoPath, city, state, country, make, model, lensModel, page, size, options); + async searchAssets(checksum?: string, city?: string, country?: string, createdAfter?: string, createdBefore?: string, deviceAssetId?: string, deviceId?: string, encodedVideoPath?: string, id?: string, isArchived?: boolean, isEncoded?: boolean, isExternal?: boolean, isFavorite?: boolean, isMotion?: boolean, isOffline?: boolean, isReadOnly?: boolean, isVisible?: boolean, lensModel?: string, libraryId?: string, make?: string, model?: string, order?: AssetOrder, originalFileName?: string, originalPath?: string, page?: number, resizePath?: string, size?: number, state?: string, takenAfter?: string, takenBefore?: string, trashedAfter?: string, trashedBefore?: string, type?: AssetTypeEnum, updatedAfter?: string, updatedBefore?: string, webpPath?: string, withDeleted?: boolean, withExif?: boolean, withPeople?: boolean, withStacked?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + const localVarAxiosArgs = await localVarAxiosParamCreator.searchAssets(checksum, city, country, createdAfter, createdBefore, deviceAssetId, deviceId, encodedVideoPath, id, isArchived, isEncoded, isExternal, isFavorite, isMotion, isOffline, isReadOnly, isVisible, lensModel, libraryId, make, model, order, originalFileName, originalPath, page, resizePath, size, state, takenAfter, takenBefore, trashedAfter, trashedBefore, type, updatedAfter, updatedBefore, webpPath, withDeleted, withExif, withPeople, withStacked, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -9023,7 +9023,7 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ getAllAssets(requestParameters: AssetApiGetAllAssetsRequest = {}, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getAllAssets(requestParameters.skip, requestParameters.take, requestParameters.userId, requestParameters.isFavorite, requestParameters.isArchived, requestParameters.updatedAfter, requestParameters.updatedBefore, requestParameters.ifNoneMatch, options).then((request) => request(axios, basePath)); + return localVarFp.getAllAssets(requestParameters.ifNoneMatch, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.skip, requestParameters.take, requestParameters.updatedAfter, requestParameters.updatedBefore, requestParameters.userId, options).then((request) => request(axios, basePath)); }, /** * Get all asset of a device that are in the database, ID only. @@ -9101,7 +9101,7 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ getMapMarkers(requestParameters: AssetApiGetMapMarkersRequest = {}, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getMapMarkers(requestParameters.isArchived, requestParameters.isFavorite, requestParameters.fileCreatedAfter, requestParameters.fileCreatedBefore, options).then((request) => request(axios, basePath)); + return localVarFp.getMapMarkers(requestParameters.fileCreatedAfter, requestParameters.fileCreatedBefore, requestParameters.isArchived, requestParameters.isFavorite, options).then((request) => request(axios, basePath)); }, /** * @@ -9128,7 +9128,7 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ getTimeBucket(requestParameters: AssetApiGetTimeBucketRequest, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.withPartners, requestParameters.key, options).then((request) => request(axios, basePath)); + return localVarFp.getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.albumId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.key, requestParameters.personId, requestParameters.userId, requestParameters.withPartners, requestParameters.withStacked, options).then((request) => request(axios, basePath)); }, /** * @@ -9137,7 +9137,7 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ getTimeBuckets(requestParameters: AssetApiGetTimeBucketsRequest, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.getTimeBuckets(requestParameters.size, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.withPartners, requestParameters.key, options).then((request) => request(axios, basePath)); + return localVarFp.getTimeBuckets(requestParameters.size, requestParameters.albumId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.key, requestParameters.personId, requestParameters.userId, requestParameters.withPartners, requestParameters.withStacked, options).then((request) => request(axios, basePath)); }, /** * @@ -9183,7 +9183,7 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ searchAssets(requestParameters: AssetApiSearchAssetsRequest = {}, options?: AxiosRequestConfig): AxiosPromise> { - return localVarFp.searchAssets(requestParameters.id, requestParameters.libraryId, requestParameters.type, requestParameters.order, requestParameters.deviceAssetId, requestParameters.deviceId, requestParameters.checksum, requestParameters.isArchived, requestParameters.isEncoded, requestParameters.isExternal, requestParameters.isFavorite, requestParameters.isMotion, requestParameters.isOffline, requestParameters.isReadOnly, requestParameters.isVisible, requestParameters.withDeleted, requestParameters.withStacked, requestParameters.withExif, requestParameters.withPeople, requestParameters.createdBefore, requestParameters.createdAfter, requestParameters.updatedBefore, requestParameters.updatedAfter, requestParameters.trashedBefore, requestParameters.trashedAfter, requestParameters.takenBefore, requestParameters.takenAfter, requestParameters.originalFileName, requestParameters.originalPath, requestParameters.resizePath, requestParameters.webpPath, requestParameters.encodedVideoPath, requestParameters.city, requestParameters.state, requestParameters.country, requestParameters.make, requestParameters.model, requestParameters.lensModel, requestParameters.page, requestParameters.size, options).then((request) => request(axios, basePath)); + return localVarFp.searchAssets(requestParameters.checksum, requestParameters.city, requestParameters.country, requestParameters.createdAfter, requestParameters.createdBefore, requestParameters.deviceAssetId, requestParameters.deviceId, requestParameters.encodedVideoPath, requestParameters.id, requestParameters.isArchived, requestParameters.isEncoded, requestParameters.isExternal, requestParameters.isFavorite, requestParameters.isMotion, requestParameters.isOffline, requestParameters.isReadOnly, requestParameters.isVisible, requestParameters.lensModel, requestParameters.libraryId, requestParameters.make, requestParameters.model, requestParameters.order, requestParameters.originalFileName, requestParameters.originalPath, requestParameters.page, requestParameters.resizePath, requestParameters.size, requestParameters.state, requestParameters.takenAfter, requestParameters.takenBefore, requestParameters.trashedAfter, requestParameters.trashedBefore, requestParameters.type, requestParameters.updatedAfter, requestParameters.updatedBefore, requestParameters.webpPath, requestParameters.withDeleted, requestParameters.withExif, requestParameters.withPeople, requestParameters.withStacked, options).then((request) => request(axios, basePath)); }, /** * @@ -9323,6 +9323,27 @@ export interface AssetApiDownloadFileRequest { * @interface AssetApiGetAllAssetsRequest */ export interface AssetApiGetAllAssetsRequest { + /** + * ETag of data already cached on the client + * @type {string} + * @memberof AssetApiGetAllAssets + */ + readonly ifNoneMatch?: string + + /** + * + * @type {boolean} + * @memberof AssetApiGetAllAssets + */ + readonly isArchived?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiGetAllAssets + */ + readonly isFavorite?: boolean + /** * * @type {number} @@ -9337,27 +9358,6 @@ export interface AssetApiGetAllAssetsRequest { */ readonly take?: number - /** - * - * @type {string} - * @memberof AssetApiGetAllAssets - */ - readonly userId?: string - - /** - * - * @type {boolean} - * @memberof AssetApiGetAllAssets - */ - readonly isFavorite?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiGetAllAssets - */ - readonly isArchived?: boolean - /** * * @type {string} @@ -9373,11 +9373,11 @@ export interface AssetApiGetAllAssetsRequest { readonly updatedBefore?: string /** - * ETag of data already cached on the client + * * @type {string} * @memberof AssetApiGetAllAssets */ - readonly ifNoneMatch?: string + readonly userId?: string } /** @@ -9498,20 +9498,6 @@ export interface AssetApiGetDownloadInfoRequest { * @interface AssetApiGetMapMarkersRequest */ export interface AssetApiGetMapMarkersRequest { - /** - * - * @type {boolean} - * @memberof AssetApiGetMapMarkers - */ - readonly isArchived?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiGetMapMarkers - */ - readonly isFavorite?: boolean - /** * * @type {string} @@ -9525,6 +9511,20 @@ export interface AssetApiGetMapMarkersRequest { * @memberof AssetApiGetMapMarkers */ readonly fileCreatedBefore?: string + + /** + * + * @type {boolean} + * @memberof AssetApiGetMapMarkers + */ + readonly isArchived?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiGetMapMarkers + */ + readonly isFavorite?: boolean } /** @@ -9582,13 +9582,6 @@ export interface AssetApiGetTimeBucketRequest { */ readonly timeBucket: string - /** - * - * @type {string} - * @memberof AssetApiGetTimeBucket - */ - readonly userId?: string - /** * * @type {string} @@ -9596,13 +9589,6 @@ export interface AssetApiGetTimeBucketRequest { */ readonly albumId?: string - /** - * - * @type {string} - * @memberof AssetApiGetTimeBucket - */ - readonly personId?: string - /** * * @type {boolean} @@ -9626,10 +9612,24 @@ export interface AssetApiGetTimeBucketRequest { /** * - * @type {boolean} + * @type {string} * @memberof AssetApiGetTimeBucket */ - readonly withStacked?: boolean + readonly key?: string + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBucket + */ + readonly personId?: string + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBucket + */ + readonly userId?: string /** * @@ -9640,10 +9640,10 @@ export interface AssetApiGetTimeBucketRequest { /** * - * @type {string} + * @type {boolean} * @memberof AssetApiGetTimeBucket */ - readonly key?: string + readonly withStacked?: boolean } /** @@ -9659,13 +9659,6 @@ export interface AssetApiGetTimeBucketsRequest { */ readonly size: TimeBucketSize - /** - * - * @type {string} - * @memberof AssetApiGetTimeBuckets - */ - readonly userId?: string - /** * * @type {string} @@ -9673,13 +9666,6 @@ export interface AssetApiGetTimeBucketsRequest { */ readonly albumId?: string - /** - * - * @type {string} - * @memberof AssetApiGetTimeBuckets - */ - readonly personId?: string - /** * * @type {boolean} @@ -9703,10 +9689,24 @@ export interface AssetApiGetTimeBucketsRequest { /** * - * @type {boolean} + * @type {string} * @memberof AssetApiGetTimeBuckets */ - readonly withStacked?: boolean + readonly key?: string + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBuckets + */ + readonly personId?: string + + /** + * + * @type {string} + * @memberof AssetApiGetTimeBuckets + */ + readonly userId?: string /** * @@ -9717,10 +9717,10 @@ export interface AssetApiGetTimeBucketsRequest { /** * - * @type {string} + * @type {boolean} * @memberof AssetApiGetTimeBuckets */ - readonly key?: string + readonly withStacked?: boolean } /** @@ -9776,28 +9776,35 @@ export interface AssetApiSearchAssetsRequest { * @type {string} * @memberof AssetApiSearchAssets */ - readonly id?: string + readonly checksum?: string /** * * @type {string} * @memberof AssetApiSearchAssets */ - readonly libraryId?: string + readonly city?: string /** * - * @type {AssetTypeEnum} + * @type {string} * @memberof AssetApiSearchAssets */ - readonly type?: AssetTypeEnum + readonly country?: string /** * - * @type {AssetOrder} + * @type {string} * @memberof AssetApiSearchAssets */ - readonly order?: AssetOrder + readonly createdAfter?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly createdBefore?: string /** * @@ -9818,7 +9825,14 @@ export interface AssetApiSearchAssetsRequest { * @type {string} * @memberof AssetApiSearchAssets */ - readonly checksum?: string + readonly encodedVideoPath?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly id?: string /** * @@ -9878,143 +9892,17 @@ export interface AssetApiSearchAssetsRequest { /** * - * @type {boolean} + * @type {string} * @memberof AssetApiSearchAssets */ - readonly withDeleted?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiSearchAssets - */ - readonly withStacked?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiSearchAssets - */ - readonly withExif?: boolean - - /** - * - * @type {boolean} - * @memberof AssetApiSearchAssets - */ - readonly withPeople?: boolean + readonly lensModel?: string /** * * @type {string} * @memberof AssetApiSearchAssets */ - readonly createdBefore?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly createdAfter?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly updatedBefore?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly updatedAfter?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly trashedBefore?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly trashedAfter?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly takenBefore?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly takenAfter?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly originalFileName?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly originalPath?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly resizePath?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly webpPath?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly encodedVideoPath?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly city?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly state?: string - - /** - * - * @type {string} - * @memberof AssetApiSearchAssets - */ - readonly country?: string + readonly libraryId?: string /** * @@ -10030,12 +9918,26 @@ export interface AssetApiSearchAssetsRequest { */ readonly model?: string + /** + * + * @type {AssetOrder} + * @memberof AssetApiSearchAssets + */ + readonly order?: AssetOrder + /** * * @type {string} * @memberof AssetApiSearchAssets */ - readonly lensModel?: string + readonly originalFileName?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly originalPath?: string /** * @@ -10044,12 +9946,110 @@ export interface AssetApiSearchAssetsRequest { */ readonly page?: number + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly resizePath?: string + /** * * @type {number} * @memberof AssetApiSearchAssets */ readonly size?: number + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly state?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly takenAfter?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly takenBefore?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly trashedAfter?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly trashedBefore?: string + + /** + * + * @type {AssetTypeEnum} + * @memberof AssetApiSearchAssets + */ + readonly type?: AssetTypeEnum + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly updatedAfter?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly updatedBefore?: string + + /** + * + * @type {string} + * @memberof AssetApiSearchAssets + */ + readonly webpPath?: string + + /** + * + * @type {boolean} + * @memberof AssetApiSearchAssets + */ + readonly withDeleted?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiSearchAssets + */ + readonly withExif?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiSearchAssets + */ + readonly withPeople?: boolean + + /** + * + * @type {boolean} + * @memberof AssetApiSearchAssets + */ + readonly withStacked?: boolean } /** @@ -10335,7 +10335,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ public getAllAssets(requestParameters: AssetApiGetAllAssetsRequest = {}, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getAllAssets(requestParameters.skip, requestParameters.take, requestParameters.userId, requestParameters.isFavorite, requestParameters.isArchived, requestParameters.updatedAfter, requestParameters.updatedBefore, requestParameters.ifNoneMatch, options).then((request) => request(this.axios, this.basePath)); + return AssetApiFp(this.configuration).getAllAssets(requestParameters.ifNoneMatch, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.skip, requestParameters.take, requestParameters.updatedAfter, requestParameters.updatedBefore, requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); } /** @@ -10431,7 +10431,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ public getMapMarkers(requestParameters: AssetApiGetMapMarkersRequest = {}, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getMapMarkers(requestParameters.isArchived, requestParameters.isFavorite, requestParameters.fileCreatedAfter, requestParameters.fileCreatedBefore, options).then((request) => request(this.axios, this.basePath)); + return AssetApiFp(this.configuration).getMapMarkers(requestParameters.fileCreatedAfter, requestParameters.fileCreatedBefore, requestParameters.isArchived, requestParameters.isFavorite, options).then((request) => request(this.axios, this.basePath)); } /** @@ -10464,7 +10464,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ public getTimeBucket(requestParameters: AssetApiGetTimeBucketRequest, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.withPartners, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); + return AssetApiFp(this.configuration).getTimeBucket(requestParameters.size, requestParameters.timeBucket, requestParameters.albumId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.key, requestParameters.personId, requestParameters.userId, requestParameters.withPartners, requestParameters.withStacked, options).then((request) => request(this.axios, this.basePath)); } /** @@ -10475,7 +10475,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ public getTimeBuckets(requestParameters: AssetApiGetTimeBucketsRequest, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).getTimeBuckets(requestParameters.size, requestParameters.userId, requestParameters.albumId, requestParameters.personId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.withStacked, requestParameters.withPartners, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); + return AssetApiFp(this.configuration).getTimeBuckets(requestParameters.size, requestParameters.albumId, requestParameters.isArchived, requestParameters.isFavorite, requestParameters.isTrashed, requestParameters.key, requestParameters.personId, requestParameters.userId, requestParameters.withPartners, requestParameters.withStacked, options).then((request) => request(this.axios, this.basePath)); } /** @@ -10531,7 +10531,7 @@ export class AssetApi extends BaseAPI { * @memberof AssetApi */ public searchAssets(requestParameters: AssetApiSearchAssetsRequest = {}, options?: AxiosRequestConfig) { - return AssetApiFp(this.configuration).searchAssets(requestParameters.id, requestParameters.libraryId, requestParameters.type, requestParameters.order, requestParameters.deviceAssetId, requestParameters.deviceId, requestParameters.checksum, requestParameters.isArchived, requestParameters.isEncoded, requestParameters.isExternal, requestParameters.isFavorite, requestParameters.isMotion, requestParameters.isOffline, requestParameters.isReadOnly, requestParameters.isVisible, requestParameters.withDeleted, requestParameters.withStacked, requestParameters.withExif, requestParameters.withPeople, requestParameters.createdBefore, requestParameters.createdAfter, requestParameters.updatedBefore, requestParameters.updatedAfter, requestParameters.trashedBefore, requestParameters.trashedAfter, requestParameters.takenBefore, requestParameters.takenAfter, requestParameters.originalFileName, requestParameters.originalPath, requestParameters.resizePath, requestParameters.webpPath, requestParameters.encodedVideoPath, requestParameters.city, requestParameters.state, requestParameters.country, requestParameters.make, requestParameters.model, requestParameters.lensModel, requestParameters.page, requestParameters.size, options).then((request) => request(this.axios, this.basePath)); + return AssetApiFp(this.configuration).searchAssets(requestParameters.checksum, requestParameters.city, requestParameters.country, requestParameters.createdAfter, requestParameters.createdBefore, requestParameters.deviceAssetId, requestParameters.deviceId, requestParameters.encodedVideoPath, requestParameters.id, requestParameters.isArchived, requestParameters.isEncoded, requestParameters.isExternal, requestParameters.isFavorite, requestParameters.isMotion, requestParameters.isOffline, requestParameters.isReadOnly, requestParameters.isVisible, requestParameters.lensModel, requestParameters.libraryId, requestParameters.make, requestParameters.model, requestParameters.order, requestParameters.originalFileName, requestParameters.originalPath, requestParameters.page, requestParameters.resizePath, requestParameters.size, requestParameters.state, requestParameters.takenAfter, requestParameters.takenBefore, requestParameters.trashedAfter, requestParameters.trashedBefore, requestParameters.type, requestParameters.updatedAfter, requestParameters.updatedBefore, requestParameters.webpPath, requestParameters.withDeleted, requestParameters.withExif, requestParameters.withPeople, requestParameters.withStacked, options).then((request) => request(this.axios, this.basePath)); } /** @@ -10643,17 +10643,17 @@ export const AuditApiAxiosParamCreator = function (configuration?: Configuration }, /** * - * @param {EntityType} entityType * @param {string} after + * @param {EntityType} entityType * @param {string} [userId] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getAuditDeletes: async (entityType: EntityType, after: string, userId?: string, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'entityType' is not null or undefined - assertParamExists('getAuditDeletes', 'entityType', entityType) + getAuditDeletes: async (after: string, entityType: EntityType, userId?: string, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'after' is not null or undefined assertParamExists('getAuditDeletes', 'after', after) + // verify required parameter 'entityType' is not null or undefined + assertParamExists('getAuditDeletes', 'entityType', entityType) const localVarPath = `/audit/deletes`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -10675,6 +10675,12 @@ export const AuditApiAxiosParamCreator = function (configuration?: Configuration // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) + if (after !== undefined) { + localVarQueryParameter['after'] = (after as any instanceof Date) ? + (after as any).toISOString() : + after; + } + if (entityType !== undefined) { localVarQueryParameter['entityType'] = entityType; } @@ -10683,12 +10689,6 @@ export const AuditApiAxiosParamCreator = function (configuration?: Configuration localVarQueryParameter['userId'] = userId; } - if (after !== undefined) { - localVarQueryParameter['after'] = (after as any instanceof Date) ? - (after as any).toISOString() : - after; - } - setSearchParams(localVarUrlObj, localVarQueryParameter); @@ -10804,14 +10804,14 @@ export const AuditApiFp = function(configuration?: Configuration) { }, /** * - * @param {EntityType} entityType * @param {string} after + * @param {EntityType} entityType * @param {string} [userId] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getAuditDeletes(entityType: EntityType, after: string, userId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getAuditDeletes(entityType, after, userId, options); + async getAuditDeletes(after: string, entityType: EntityType, userId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getAuditDeletes(after, entityType, userId, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -10859,7 +10859,7 @@ export const AuditApiFactory = function (configuration?: Configuration, basePath * @throws {RequiredError} */ getAuditDeletes(requestParameters: AuditApiGetAuditDeletesRequest, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getAuditDeletes(requestParameters.entityType, requestParameters.after, requestParameters.userId, options).then((request) => request(axios, basePath)); + return localVarFp.getAuditDeletes(requestParameters.after, requestParameters.entityType, requestParameters.userId, options).then((request) => request(axios, basePath)); }, /** * @@ -10901,13 +10901,6 @@ export interface AuditApiFixAuditFilesRequest { * @interface AuditApiGetAuditDeletesRequest */ export interface AuditApiGetAuditDeletesRequest { - /** - * - * @type {EntityType} - * @memberof AuditApiGetAuditDeletes - */ - readonly entityType: EntityType - /** * * @type {string} @@ -10915,6 +10908,13 @@ export interface AuditApiGetAuditDeletesRequest { */ readonly after: string + /** + * + * @type {EntityType} + * @memberof AuditApiGetAuditDeletes + */ + readonly entityType: EntityType + /** * * @type {string} @@ -10963,7 +10963,7 @@ export class AuditApi extends BaseAPI { * @memberof AuditApi */ public getAuditDeletes(requestParameters: AuditApiGetAuditDeletesRequest, options?: AxiosRequestConfig) { - return AuditApiFp(this.configuration).getAuditDeletes(requestParameters.entityType, requestParameters.after, requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); + return AuditApiFp(this.configuration).getAuditDeletes(requestParameters.after, requestParameters.entityType, requestParameters.userId, options).then((request) => request(this.axios, this.basePath)); } /** @@ -14639,17 +14639,17 @@ export const SearchApiAxiosParamCreator = function (configuration?: Configuratio }, /** * + * @param {boolean} [clip] + * @param {boolean} [motion] * @param {string} [q] * @param {string} [query] - * @param {boolean} [clip] - * @param {'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER'} [type] * @param {boolean} [recent] - * @param {boolean} [motion] + * @param {'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER'} [type] * @param {boolean} [withArchived] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - search: async (q?: string, query?: string, clip?: boolean, type?: 'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER', recent?: boolean, motion?: boolean, withArchived?: boolean, options: AxiosRequestConfig = {}): Promise => { + search: async (clip?: boolean, motion?: boolean, q?: string, query?: string, recent?: boolean, type?: 'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER', withArchived?: boolean, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/search`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -14671,6 +14671,14 @@ export const SearchApiAxiosParamCreator = function (configuration?: Configuratio // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) + if (clip !== undefined) { + localVarQueryParameter['clip'] = clip; + } + + if (motion !== undefined) { + localVarQueryParameter['motion'] = motion; + } + if (q !== undefined) { localVarQueryParameter['q'] = q; } @@ -14679,20 +14687,12 @@ export const SearchApiAxiosParamCreator = function (configuration?: Configuratio localVarQueryParameter['query'] = query; } - if (clip !== undefined) { - localVarQueryParameter['clip'] = clip; - } - - if (type !== undefined) { - localVarQueryParameter['type'] = type; - } - if (recent !== undefined) { localVarQueryParameter['recent'] = recent; } - if (motion !== undefined) { - localVarQueryParameter['motion'] = motion; + if (type !== undefined) { + localVarQueryParameter['type'] = type; } if (withArchived !== undefined) { @@ -14781,18 +14781,18 @@ export const SearchApiFp = function(configuration?: Configuration) { }, /** * + * @param {boolean} [clip] + * @param {boolean} [motion] * @param {string} [q] * @param {string} [query] - * @param {boolean} [clip] - * @param {'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER'} [type] * @param {boolean} [recent] - * @param {boolean} [motion] + * @param {'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER'} [type] * @param {boolean} [withArchived] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async search(q?: string, query?: string, clip?: boolean, type?: 'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER', recent?: boolean, motion?: boolean, withArchived?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.search(q, query, clip, type, recent, motion, withArchived, options); + async search(clip?: boolean, motion?: boolean, q?: string, query?: string, recent?: boolean, type?: 'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER', withArchived?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.search(clip, motion, q, query, recent, type, withArchived, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -14831,7 +14831,7 @@ export const SearchApiFactory = function (configuration?: Configuration, basePat * @throws {RequiredError} */ search(requestParameters: SearchApiSearchRequest = {}, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.search(requestParameters.q, requestParameters.query, requestParameters.clip, requestParameters.type, requestParameters.recent, requestParameters.motion, requestParameters.withArchived, options).then((request) => request(axios, basePath)); + return localVarFp.search(requestParameters.clip, requestParameters.motion, requestParameters.q, requestParameters.query, requestParameters.recent, requestParameters.type, requestParameters.withArchived, options).then((request) => request(axios, basePath)); }, /** * @@ -14851,6 +14851,20 @@ export const SearchApiFactory = function (configuration?: Configuration, basePat * @interface SearchApiSearchRequest */ export interface SearchApiSearchRequest { + /** + * + * @type {boolean} + * @memberof SearchApiSearch + */ + readonly clip?: boolean + + /** + * + * @type {boolean} + * @memberof SearchApiSearch + */ + readonly motion?: boolean + /** * * @type {string} @@ -14870,7 +14884,7 @@ export interface SearchApiSearchRequest { * @type {boolean} * @memberof SearchApiSearch */ - readonly clip?: boolean + readonly recent?: boolean /** * @@ -14879,20 +14893,6 @@ export interface SearchApiSearchRequest { */ readonly type?: 'IMAGE' | 'VIDEO' | 'AUDIO' | 'OTHER' - /** - * - * @type {boolean} - * @memberof SearchApiSearch - */ - readonly recent?: boolean - - /** - * - * @type {boolean} - * @memberof SearchApiSearch - */ - readonly motion?: boolean - /** * * @type {boolean} @@ -14947,7 +14947,7 @@ export class SearchApi extends BaseAPI { * @memberof SearchApi */ public search(requestParameters: SearchApiSearchRequest = {}, options?: AxiosRequestConfig) { - return SearchApiFp(this.configuration).search(requestParameters.q, requestParameters.query, requestParameters.clip, requestParameters.type, requestParameters.recent, requestParameters.motion, requestParameters.withArchived, options).then((request) => request(this.axios, this.basePath)); + return SearchApiFp(this.configuration).search(requestParameters.clip, requestParameters.motion, requestParameters.q, requestParameters.query, requestParameters.recent, requestParameters.type, requestParameters.withArchived, options).then((request) => request(this.axios, this.basePath)); } /** @@ -15675,13 +15675,13 @@ export const SharedLinkApiAxiosParamCreator = function (configuration?: Configur }, /** * + * @param {string} [key] * @param {string} [password] * @param {string} [token] - * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getMySharedLink: async (password?: string, token?: string, key?: string, options: AxiosRequestConfig = {}): Promise => { + getMySharedLink: async (key?: string, password?: string, token?: string, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/shared-link/me`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -15703,6 +15703,10 @@ export const SharedLinkApiAxiosParamCreator = function (configuration?: Configur // http bearer authentication required await setBearerAuthToObject(localVarHeaderParameter, configuration) + if (key !== undefined) { + localVarQueryParameter['key'] = key; + } + if (password !== undefined) { localVarQueryParameter['password'] = password; } @@ -15711,10 +15715,6 @@ export const SharedLinkApiAxiosParamCreator = function (configuration?: Configur localVarQueryParameter['token'] = token; } - if (key !== undefined) { - localVarQueryParameter['key'] = key; - } - setSearchParams(localVarUrlObj, localVarQueryParameter); @@ -15954,14 +15954,14 @@ export const SharedLinkApiFp = function(configuration?: Configuration) { }, /** * + * @param {string} [key] * @param {string} [password] * @param {string} [token] - * @param {string} [key] * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getMySharedLink(password?: string, token?: string, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getMySharedLink(password, token, key, options); + async getMySharedLink(key?: string, password?: string, token?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getMySharedLink(key, password, token, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -16050,7 +16050,7 @@ export const SharedLinkApiFactory = function (configuration?: Configuration, bas * @throws {RequiredError} */ getMySharedLink(requestParameters: SharedLinkApiGetMySharedLinkRequest = {}, options?: AxiosRequestConfig): AxiosPromise { - return localVarFp.getMySharedLink(requestParameters.password, requestParameters.token, requestParameters.key, options).then((request) => request(axios, basePath)); + return localVarFp.getMySharedLink(requestParameters.key, requestParameters.password, requestParameters.token, options).then((request) => request(axios, basePath)); }, /** * @@ -16139,6 +16139,13 @@ export interface SharedLinkApiCreateSharedLinkRequest { * @interface SharedLinkApiGetMySharedLinkRequest */ export interface SharedLinkApiGetMySharedLinkRequest { + /** + * + * @type {string} + * @memberof SharedLinkApiGetMySharedLink + */ + readonly key?: string + /** * * @type {string} @@ -16152,13 +16159,6 @@ export interface SharedLinkApiGetMySharedLinkRequest { * @memberof SharedLinkApiGetMySharedLink */ readonly token?: string - - /** - * - * @type {string} - * @memberof SharedLinkApiGetMySharedLink - */ - readonly key?: string } /** @@ -16285,7 +16285,7 @@ export class SharedLinkApi extends BaseAPI { * @memberof SharedLinkApi */ public getMySharedLink(requestParameters: SharedLinkApiGetMySharedLinkRequest = {}, options?: AxiosRequestConfig) { - return SharedLinkApiFp(this.configuration).getMySharedLink(requestParameters.password, requestParameters.token, requestParameters.key, options).then((request) => request(this.axios, this.basePath)); + return SharedLinkApiFp(this.configuration).getMySharedLink(requestParameters.key, requestParameters.password, requestParameters.token, options).then((request) => request(this.axios, this.basePath)); } /** diff --git a/server/src/immich/app.utils.ts b/server/src/immich/app.utils.ts index 4eeba8cc4..0dd984a02 100644 --- a/server/src/immich/app.utils.ts +++ b/server/src/immich/app.utils.ts @@ -20,10 +20,12 @@ import { import { NextFunction, Response } from 'express'; import { writeFileSync } from 'fs'; import { access, constants } from 'fs/promises'; +import _ from 'lodash'; import path, { isAbsolute } from 'path'; import { promisify } from 'util'; import { applyDecorators, UsePipes, ValidationPipe } from '@nestjs/common'; +import { SchemaObject } from '@nestjs/swagger/dist/interfaces/open-api-spec.interface'; import { Metadata } from './app.guard'; export function UseValidation() { @@ -110,8 +112,21 @@ export const routeToErrorMessage = (methodName: string) => const patchOpenAPI = (document: OpenAPIObject) => { document.paths = sortKeys(document.paths); + if (document.components?.schemas) { - document.components.schemas = sortKeys(document.components.schemas); + const schemas = document.components.schemas as Record; + + document.components.schemas = sortKeys(schemas); + + for (const schema of Object.values(schemas)) { + if (schema.properties) { + schema.properties = sortKeys(schema.properties); + } + + if (schema.required) { + schema.required = schema.required.sort(); + } + } } for (const [key, value] of Object.entries(document.paths)) { @@ -152,6 +167,10 @@ const patchOpenAPI = (document: OpenAPIObject) => { if (operation.description === '') { delete operation.description; } + + if (operation.parameters) { + operation.parameters = _.orderBy(operation.parameters, 'name'); + } } }