Continue work on moving ID Generation to clients

Author: PineappleIOnic

templates/deno/src/id.ts.twig

@@ -1,5 +1,5 @@
 export class ID {
-    function uniqid(): string {
+    static uniqid(): string {
         const now = new Date();
         const secondsSinceEpoch = Math.floor(now.getTime() / 1000);
         const msecs = now.getTime() - secondsSinceEpoch * 1000;
@@ -15,7 +15,7 @@ export class ID {
     }
 
     public static unique(padding: number = 5): string {
-        const baseId = uniqid();
+        const baseId = ID.uniqid();
         let randomPadding = '';
 
         for (let i = 0; i < padding; i++) {

templates/dotnet/src/Appwrite/ID.cs.twig

@@ -1,3 +1,5 @@
+using System;
+
 namespace {{ spec.title | caseUcfirst }}
 {
     public static class ID
@@ -16,6 +18,7 @@ namespace {{ spec.title | caseUcfirst }}
 
         public static string Unique(int padding = 5)
         {
+            var random = new Random();
             var baseId = UniqID();
             var randomPadding = "";
 

templates/node/lib/id.js.twig

@@ -1,5 +1,5 @@
 class ID {
-    static function uniqid() {
+    static uniqid = () => {
         const now = new Date();
         const secondsSinceEpoch = Math.floor(now.getTime() / 1000);
         const msecs = now.getTime() - secondsSinceEpoch * 1000;
@@ -11,7 +11,7 @@ class ID {
     }
 
     static unique = (padding = 7) => {
-        const baseId = uniqid();
+        const baseId = ID.uniqid();
         let randomPadding = '';
 
         for (let i = 0; i < padding; i++) {

templates/python/package/id.py.twig

@@ -16,6 +16,6 @@ class ID:
 
     @staticmethod
     def unique(padding = 5):
-      base_id = uniqid()
+        base_id = uniqid()
         random_padding = ''.join(random.choice('0123456789abcdef') for _ in range(padding))
         return base_id + random_padding

templates/ruby/lib/container/id.rb.twig

@@ -14,7 +14,7 @@ module {{spec.title | caseUcfirst}}
             id
         end
 
-        def self.unique_id(padding=5)
+        def self.unique(padding=5)
             base_id = uniqid
             random_padding = SecureRandom.hex(padding / 2)
             random_padding = random_padding[0...padding]

tests/Base.php

@@ -212,7 +212,14 @@ public function testHTTPSuccess(): void
         $this->assertGreaterThanOrEqual(count($this->expectedOutput), count($output));
 
         foreach ($this->expectedOutput as $i => $row) {
-            $this->assertEquals($output[$i], $row);
+            // Check we are generating ID's correctly
+            if ($row == 'unique()') {
+                $this->assertNotEmpty($output[$i]);
+                $this->assertIsString($output[$i]);
+                $this->assertNotEquals($output[$i], 'unique()');
+            } else {
+                $this->assertEquals($output[$i], $row);
+            }
         }
     }